Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking changes from David Miller:

 1) GRE now works over ipv6, from Dmitry Kozlov.

 2) Make SCTP more network namespace aware, from Eric Biederman.

 3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.

 4) Make openvswitch network namespace aware, from Pravin B Shelar.

 5) IPV6 NAT implementation, from Patrick McHardy.

 6) Server side support for TCP Fast Open, from Jerry Chu and others.

 7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and Daniel
    Borkmann.

 8) Increate the loopback default MTU to 64K, from Eric Dumazet.

 9) Use a per-task rather than per-socket page fragment allocator for
    outgoing networking traffic.  This benefits processes that have very
    many mostly idle sockets, which is quite common.

    From Eric Dumazet.

10) Use up to 32K for page fragment allocations, with fallbacks to
    smaller sizes when higher order page allocations fail.  Benefits are
    a) less segments for driver to process b) less calls to page
    allocator c) less waste of space.

    From Eric Dumazet.

11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.

12) VXLAN device driver, one way to handle VLAN issues such as the
    limitation of 4096 VLAN IDs yet still have some level of isolation.
    From Stephen Hemminger.

13) As usual there is a large boatload of driver changes, with the scale
    perhaps tilted towards the wireless side this time around.

Fix up various fairly trivial conflicts, mostly caused by the user
namespace changes.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1012 commits)
  hyperv: Add buffer for extended info after the RNDIS response message.
  hyperv: Report actual status in receive completion packet
  hyperv: Remove extra allocated space for recv_pkt_list elements
  hyperv: Fix page buffer handling in rndis_filter_send_request()
  hyperv: Fix the missing return value in rndis_filter_set_packet_filter()
  hyperv: Fix the max_xfer_size in RNDIS initialization
  vxlan: put UDP socket in correct namespace
  vxlan: Depend on CONFIG_INET
  sfc: Fix the reported priorities of different filter types
  sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP
  sfc: Fix loopback self-test with separate_tx_channels=1
  sfc: Fix MCDI structure field lookup
  sfc: Add parentheses around use of bitfield macro arguments
  sfc: Fix null function pointer in efx_sriov_channel_type
  vxlan: virtual extensible lan
  igmp: export symbol ip_mc_leave_group
  netlink: add attributes to fdb interface
  tg3: unconditionally select HWMON support when tg3 is enabled.
  Revert "net: ti cpsw ethernet: allow reading phy interface mode from DT"
  gre: fix sparse warning
  ...
  • Loading branch information...
commit aecdc33e111b2c447b622e287c6003726daa1426 2 parents a20acf9 + a3a6cab
Linus Torvalds torvalds authored

Showing 988 changed files with 16,059 additions and 5,564 deletions. Show diff stats Hide diff stats

  1. +5 1 Documentation/ABI/testing/sysfs-ptp
  2. +49 0 Documentation/devicetree/bindings/net/can/c_can.txt
  3. +109 0 Documentation/devicetree/bindings/net/cpsw.txt
  4. +33 0 Documentation/devicetree/bindings/net/davinci-mdio.txt
  5. +75 0 Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt
  6. +9 1 Documentation/filesystems/nfs/nfsroot.txt
  7. +3 0  Documentation/infiniband/ipoib.txt
  8. +4 3 Documentation/networking/batman-adv.txt
  9. +25 5 Documentation/networking/bonding.txt
  10. +28 9 Documentation/networking/ip-sysctl.txt
  11. +0 5 Documentation/networking/stmmac.txt
  12. +47 0 Documentation/networking/vxlan.txt
  13. +1 0  MAINTAINERS
  14. +0 1  arch/m68k/configs/amiga_defconfig
  15. +0 1  arch/m68k/configs/apollo_defconfig
  16. +0 1  arch/m68k/configs/atari_defconfig
  17. +0 1  arch/m68k/configs/bvme6000_defconfig
  18. +0 1  arch/m68k/configs/hp300_defconfig
  19. +0 1  arch/m68k/configs/mac_defconfig
  20. +0 1  arch/m68k/configs/multi_defconfig
  21. +0 1  arch/m68k/configs/mvme147_defconfig
  22. +0 1  arch/m68k/configs/mvme16x_defconfig
  23. +0 1  arch/m68k/configs/q40_defconfig
  24. +0 1  arch/m68k/configs/sun3_defconfig
  25. +0 1  arch/m68k/configs/sun3x_defconfig
  26. +0 1  arch/mips/configs/ar7_defconfig
  27. +0 1  arch/mips/configs/bcm47xx_defconfig
  28. +0 1  arch/mips/configs/ip22_defconfig
  29. +0 1  arch/mips/configs/jazz_defconfig
  30. +0 1  arch/mips/configs/malta_defconfig
  31. +0 1  arch/mips/configs/markeins_defconfig
  32. +0 1  arch/mips/configs/nlm_xlp_defconfig
  33. +0 1  arch/mips/configs/nlm_xlr_defconfig
  34. +0 1  arch/mips/configs/rm200_defconfig
  35. +0 1  arch/powerpc/configs/pmac32_defconfig
  36. +0 1  arch/powerpc/configs/ppc64_defconfig
  37. +0 1  arch/powerpc/configs/ppc64e_defconfig
  38. +0 1  arch/powerpc/configs/ppc6xx_defconfig
  39. +4 0 arch/sparc/net/bpf_jit_comp.c
  40. +0 1  arch/tile/configs/tilegx_defconfig
  41. +0 1  arch/tile/configs/tilepro_defconfig
  42. +34 0 arch/x86/net/bpf_jit_comp.c
  43. +3 4 crypto/crypto_user.c
  44. +0 1  drivers/Makefile
  45. +2 2 drivers/bcma/Kconfig
  46. +2 0  drivers/bcma/bcma_private.h
  47. +1 1  drivers/bcma/core.c
  48. +25 3 drivers/bcma/driver_chipcommon_nflash.c
  49. +6 3 drivers/bcma/driver_chipcommon_pmu.c
  50. +120 3 drivers/bcma/driver_chipcommon_sflash.c
  51. +3 3 drivers/bcma/driver_pci.c
  52. +4 4 drivers/bcma/driver_pci_host.c
  53. +7 5 drivers/bcma/host_pci.c
  54. +1 1  drivers/bcma/host_soc.c
  55. +27 0 drivers/bcma/main.c
  56. +2 0  drivers/bcma/sprom.c
  57. +1 7 drivers/bluetooth/bcm203x.c
  58. +4 8 drivers/bluetooth/bfusb.c
  59. +2 5 drivers/bluetooth/bluecard_cs.c
  60. +2 6 drivers/bluetooth/bpa10x.c
  61. +1 4 drivers/bluetooth/bt3c_cs.c
  62. +5 13 drivers/bluetooth/btmrvl_sdio.c
  63. +2 6 drivers/bluetooth/btsdio.c
  64. +2 5 drivers/bluetooth/btuart_cs.c
  65. +5 11 drivers/bluetooth/btusb.c
  66. +3 21 drivers/bluetooth/btwilink.c
  67. +1 2  drivers/bluetooth/dtl1_cs.c
  68. +1 1  drivers/bluetooth/hci_ldisc.c
  69. +1 1  drivers/bluetooth/hci_ll.c
  70. +1 1  drivers/bluetooth/hci_vhci.c
  71. +1 2  drivers/connector/connector.c
  72. +1 1  drivers/infiniband/core/netlink.c
  73. +1 1  drivers/infiniband/hw/cxgb4/qp.c
  74. +2 1  drivers/infiniband/ulp/ipoib/Makefile
  75. +16 0 drivers/infiniband/ulp/ipoib/ipoib.h
  76. +24 10 drivers/infiniband/ulp/ipoib/ipoib_cm.c
  77. +31 10 drivers/infiniband/ulp/ipoib/ipoib_main.c
  78. +172 0 drivers/infiniband/ulp/ipoib/ipoib_netlink.c
  79. +70 54 drivers/infiniband/ulp/ipoib/ipoib_vlan.c
  80. +0 1  drivers/isdn/gigaset/common.c
  81. +15 2 drivers/net/Kconfig
  82. +2 0  drivers/net/Makefile
  83. +93 47 drivers/net/bonding/bond_main.c
  84. +125 5 drivers/net/can/c_can/c_can.c
  85. +12 2 drivers/net/can/c_can/c_can.h
  86. +3 3 drivers/net/can/c_can/c_can_pci.c
  87. +108 15 drivers/net/can/c_can/c_can_platform.c
  88. +19 10 drivers/net/can/flexcan.c
  89. +2 2 drivers/net/can/mscan/mpc5xxx_can.c
  90. +24 7 drivers/net/can/sja1000/sja1000.c
  91. +4 4 drivers/net/can/usb/peak_usb/pcan_usb_core.c
  92. +1 1  drivers/net/can/usb/peak_usb/pcan_usb_core.h
  93. +4 4 drivers/net/can/usb/peak_usb/pcan_usb_pro.c
  94. +0 9 drivers/net/ethernet/Kconfig
  95. +0 1  drivers/net/ethernet/Makefile
  96. +1 0  drivers/net/ethernet/broadcom/Kconfig
  97. +2 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
  98. +16 8 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
  99. +13 3 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
  100. +4 8 drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
  101. +32 26 drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
  102. +0 3  drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
  103. +81 28 drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
  104. +1 1  drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
  105. +828 873 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
  106. +5 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
  107. +22 12 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
  108. +11 3 drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
  109. +2 3 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
  110. +30 5 drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
  111. +86 30 drivers/net/ethernet/broadcom/cnic.c
  112. +5 0 drivers/net/ethernet/broadcom/cnic.h
  113. +1 1  drivers/net/ethernet/broadcom/cnic_defs.h
  114. +2 2 drivers/net/ethernet/broadcom/cnic_if.h
  115. +356 178 drivers/net/ethernet/broadcom/tg3.c
  116. +8 1 drivers/net/ethernet/broadcom/tg3.h
  117. +1 0  drivers/net/ethernet/brocade/bna/bnad.c
  118. +46 5 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
  119. +838 116 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
  120. +2 0  drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
  121. +277 64 drivers/net/ethernet/chelsio/cxgb4/sge.c
  122. +705 29 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
  123. +80 0 drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
  124. +141 44 drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
  125. +77 20 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
  126. +3 2 drivers/net/ethernet/chelsio/cxgb4vf/sge.c
  127. +1 1  drivers/net/ethernet/emulex/benet/be.h
  128. +39 16 drivers/net/ethernet/emulex/benet/be_cmds.c
  129. +3 3 drivers/net/ethernet/emulex/benet/be_cmds.h
  130. +12 45 drivers/net/ethernet/emulex/benet/be_ethtool.c
  131. +58 38 drivers/net/ethernet/emulex/benet/be_main.c
  132. +7 0 drivers/net/ethernet/freescale/Kconfig
  133. +1 0  drivers/net/ethernet/freescale/Makefile
  134. +292 257 drivers/net/ethernet/freescale/fsl_pq_mdio.c
  135. +0 52 drivers/net/ethernet/freescale/fsl_pq_mdio.h
  136. +10 2 drivers/net/ethernet/freescale/gianfar.c
  137. +10 1 drivers/net/ethernet/freescale/gianfar.h
  138. +1 1  drivers/net/ethernet/freescale/gianfar_ptp.c
  139. +0 1  drivers/net/ethernet/freescale/ucc_geth.c
  140. +274 0 drivers/net/ethernet/freescale/xgmac_mdio.c
  141. +1 1  drivers/net/ethernet/i825xx/Kconfig
  142. +2 2 drivers/net/ethernet/i825xx/znet.c
  143. +39 0 drivers/net/ethernet/intel/e1000/e1000_ethtool.c
  144. +14 0 drivers/net/ethernet/intel/e1000/e1000_main.c
  145. +2 2 drivers/net/ethernet/intel/e1000e/82571.c
  146. +41 3 drivers/net/ethernet/intel/e1000e/ethtool.c
  147. +13 6 drivers/net/ethernet/intel/e1000e/netdev.c
  148. +29 2 drivers/net/ethernet/intel/e1000e/phy.c
  149. +13 4 drivers/net/ethernet/intel/igb/e1000_82575.c
  150. +10 1 drivers/net/ethernet/intel/igb/e1000_defines.h
  151. +27 2 drivers/net/ethernet/intel/igb/e1000_phy.c
  152. +3 2 drivers/net/ethernet/intel/igb/e1000_phy.h
  153. +3 0  drivers/net/ethernet/intel/igb/e1000_regs.h
  154. +24 17 drivers/net/ethernet/intel/igb/igb.h
  155. +125 73 drivers/net/ethernet/intel/igb/igb_ethtool.c
  156. +198 513 drivers/net/ethernet/intel/igb/igb_main.c
  157. +561 116 drivers/net/ethernet/intel/igb/igb_ptp.c
  158. +1 1  drivers/net/ethernet/intel/ixgbe/Makefile
  159. +28 7 drivers/net/ethernet/intel/ixgbe/ixgbe.h
  160. +300 0 drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
  161. +310 263 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
  162. +2 1  drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
  163. +64 41 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
  164. +1 0  drivers/net/ethernet/intel/ixgbevf/defines.h
  165. +8 1 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
  166. +194 78 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
  167. +11 4 drivers/net/ethernet/intel/ixgbevf/mbx.c
  168. +19 2 drivers/net/ethernet/intel/ixgbevf/mbx.h
  169. +108 14 drivers/net/ethernet/intel/ixgbevf/vf.c
  170. +4 0 drivers/net/ethernet/intel/ixgbevf/vf.h
  171. +0 4 drivers/net/ethernet/mellanox/mlx4/en_tx.c
  172. +0 345 drivers/net/ethernet/mipsnet.c
  173. +13 4 drivers/net/ethernet/nvidia/forcedeth.c
  174. +3 1 drivers/net/ethernet/realtek/r8169.c
  175. +7 0 drivers/net/ethernet/sfc/Kconfig
  176. +1 0  drivers/net/ethernet/sfc/Makefile
  177. +11 11 drivers/net/ethernet/sfc/bitfield.h
  178. +148 102 drivers/net/ethernet/sfc/efx.c
  179. +1 0  drivers/net/ethernet/sfc/efx.h
  180. +6 10 drivers/net/ethernet/sfc/ethtool.c
  181. +1 1  drivers/net/ethernet/sfc/falcon_boards.c
  182. +53 55 drivers/net/ethernet/sfc/filter.c
  183. +1 6 drivers/net/ethernet/sfc/filter.h
  184. +39 10 drivers/net/ethernet/sfc/mcdi.c
  185. +10 2 drivers/net/ethernet/sfc/mcdi.h
  186. +15 14 drivers/net/ethernet/sfc/mcdi_pcol.h
  187. +5 2 drivers/net/ethernet/sfc/mtd.c
  188. +52 26 drivers/net/ethernet/sfc/net_driver.h
  189. +4 2 drivers/net/ethernet/sfc/nic.c
  190. +36 0 drivers/net/ethernet/sfc/nic.h
  191. +1,484 0 drivers/net/ethernet/sfc/ptp.c
  192. +16 4 drivers/net/ethernet/sfc/rx.c
  193. +2 1  drivers/net/ethernet/sfc/selftest.c
  194. +1 0  drivers/net/ethernet/sfc/siena.c
  195. +8 0 drivers/net/ethernet/sfc/siena_sriov.c
  196. +251 376 drivers/net/ethernet/sfc/tx.c
  197. +6 5 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
  198. +0 1  drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
  199. +8 31 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
  200. +0 1  drivers/net/ethernet/sun/sunbmac.c
  201. +2 2 drivers/net/ethernet/ti/Kconfig
  202. +173 6 drivers/net/ethernet/ti/cpsw.c
  203. +37 4 drivers/net/ethernet/ti/davinci_mdio.c
  204. +0 1  drivers/net/ethernet/tundra/tsi108_eth.c
  205. +1 2  drivers/net/ethernet/wiznet/w5100.c
  206. +1 2  drivers/net/ethernet/wiznet/w5300.c
  207. +2 2 drivers/net/hyperv/hyperv_net.h
  208. +13 9 drivers/net/hyperv/netvsc.c
  209. +3 1 drivers/net/hyperv/netvsc_drv.c
  210. +45 15 drivers/net/hyperv/rndis_filter.c
  211. +11 0 drivers/{ → net}/ieee802154/Kconfig
  212. +1 0  drivers/{ → net}/ieee802154/Makefile
  213. +1 11 drivers/{ → net}/ieee802154/at86rf230.c
  214. +0 1  drivers/{ → net}/ieee802154/fakehard.c
  215. 0  drivers/{ → net}/ieee802154/fakelb.c
  216. +767 0 drivers/net/ieee802154/mrf24j40.c
  217. +2 1  drivers/net/loopback.c
  218. +3 3 drivers/net/macvlan.c
  219. +13 0 drivers/net/phy/Kconfig
  220. +1 0  drivers/net/phy/Makefile
  221. +1 1  drivers/net/phy/dp83640.c
  222. +127 0 drivers/net/phy/lxt.c
  223. +40 92 drivers/net/phy/mdio-gpio.c
  224. +171 0 drivers/net/phy/mdio-mux-mmioreg.c
  225. +7 67 drivers/net/phy/phy.c
  226. +48 10 drivers/net/ppp/ppp_generic.c
  227. +2 2 drivers/net/team/Kconfig
  228. +295 47 drivers/net/team/team.c
  229. +4 4 drivers/net/team/team_mode_broadcast.c
  230. +4 4 drivers/net/team/team_mode_roundrobin.c
  231. +24 16 drivers/net/usb/asix_devices.c
  232. +32 23 drivers/net/usb/catc.c
  233. +1 10 drivers/net/usb/cx82310_eth.c
  234. +7 3 drivers/net/usb/gl620a.c
  235. +67 67 drivers/net/usb/kaweth.c
  236. +23 28 drivers/net/usb/net1080.c
  237. +17 30 drivers/net/usb/qmi_wwan.c
  238. +3 3 drivers/net/usb/rtl8150.c
  239. +8 17 drivers/net/usb/sierra_net.c
  240. +237 3 drivers/net/usb/smsc75xx.c
  241. +355 205 drivers/net/usb/smsc95xx.c
  242. +11 1 drivers/net/usb/smsc95xx.h
  243. +3 0  drivers/net/veth.c
  244. +1 1  drivers/net/virtio_net.c
  245. +1,219 0 drivers/net/vxlan.c
  246. +1 2  drivers/net/wimax/i2400m/driver.c
  247. +3 1 drivers/net/wireless/adm8211.c
  248. +2 5 drivers/net/wireless/airo.c
  249. +15 43 drivers/net/wireless/at76c50x-usb.c
  250. +1 0  drivers/net/wireless/ath/ath.h
  251. +1 1  drivers/net/wireless/ath/ath5k/ath5k.h
  252. +4 2 drivers/net/wireless/ath/ath5k/base.c
  253. +8 4 drivers/net/wireless/ath/ath5k/mac80211-ops.c
  254. +34 11 drivers/net/wireless/ath/ath5k/phy.c
  255. +2 2 drivers/net/wireless/ath/ath6kl/cfg80211.c
  256. +1 1  drivers/net/wireless/ath/ath6kl/cfg80211.h
  257. +1 1  drivers/net/wireless/ath/ath9k/ani.c
  258. +69 48 drivers/net/wireless/ath/ath9k/antenna.c
  259. +175 113 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
  260. +2 1  drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
  261. +52 5 drivers/net/wireless/ath/ath9k/ar9003_hw.c
  262. +19 2 drivers/net/wireless/ath/ath9k/ar9003_mac.c
  263. +26 17 drivers/net/wireless/ath/ath9k/ar9003_mci.c
  264. +7 7 drivers/net/wireless/ath/ath9k/ar9003_mci.h
  265. +156 41 drivers/net/wireless/ath/ath9k/ar9003_phy.c
  266. +68 27 drivers/net/wireless/ath/ath9k/ar9003_phy.h
  267. +1 1  drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
  268. +1,231 0 drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h
  269. +8 4 drivers/net/wireless/ath/ath9k/ath9k.h
  270. +34 31 drivers/net/wireless/ath/ath9k/btcoex.c
  271. +2 1  drivers/net/wireless/ath/ath9k/btcoex.h
  272. +56 2 drivers/net/wireless/ath/ath9k/debug.c
  273. +3 1 drivers/net/wireless/ath/ath9k/debug.h
  274. +2 1  drivers/net/wireless/ath/ath9k/eeprom.h
  275. +45 27 drivers/net/wireless/ath/ath9k/gpio.c
  276. +25 13 drivers/net/wireless/ath/ath9k/hif_usb.c
  277. +3 1 drivers/net/wireless/ath/ath9k/hif_usb.h
  278. +1 0  drivers/net/wireless/ath/ath9k/htc.h
  279. +1 1  drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
  280. +11 2 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
  281. +5 0 drivers/net/wireless/ath/ath9k/htc_drv_init.c
  282. +39 12 drivers/net/wireless/ath/ath9k/htc_drv_main.c
  283. +1 1  drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
  284. +7 0 drivers/net/wireless/ath/ath9k/hw-ops.h
  285. +40 17 drivers/net/wireless/ath/ath9k/hw.c
  286. +3 1 drivers/net/wireless/ath/ath9k/hw.h
Sorry, we could not display the entire diff because too many files (988) changed.
6 Documentation/ABI/testing/sysfs-ptp
@@ -19,7 +19,11 @@ Date: September 2010
19 19 Contact: Richard Cochran <richardcochran@gmail.com>
20 20 Description:
21 21 This file contains the name of the PTP hardware clock
22   - as a human readable string.
  22 + as a human readable string. The purpose of this
  23 + attribute is to provide the user with a "friendly
  24 + name" and to help distinguish PHY based devices from
  25 + MAC based ones. The string does not necessarily have
  26 + to be any kind of unique id.
23 27
24 28 What: /sys/class/ptp/ptpN/max_adjustment
25 29 Date: September 2010
49 Documentation/devicetree/bindings/net/can/c_can.txt
... ... @@ -0,0 +1,49 @@
  1 +Bosch C_CAN/D_CAN controller Device Tree Bindings
  2 +-------------------------------------------------
  3 +
  4 +Required properties:
  5 +- compatible : Should be "bosch,c_can" for C_CAN controllers and
  6 + "bosch,d_can" for D_CAN controllers.
  7 +- reg : physical base address and size of the C_CAN/D_CAN
  8 + registers map
  9 +- interrupts : property with a value describing the interrupt
  10 + number
  11 +
  12 +Optional properties:
  13 +- ti,hwmods : Must be "d_can<n>" or "c_can<n>", n being the
  14 + instance number
  15 +
  16 +Note: "ti,hwmods" field is used to fetch the base address and irq
  17 +resources from TI, omap hwmod data base during device registration.
  18 +Future plan is to migrate hwmod data base contents into device tree
  19 +blob so that, all the required data will be used from device tree dts
  20 +file.
  21 +
  22 +Example:
  23 +
  24 +Step1: SoC common .dtsi file
  25 +
  26 + dcan1: d_can@481d0000 {
  27 + compatible = "bosch,d_can";
  28 + reg = <0x481d0000 0x2000>;
  29 + interrupts = <55>;
  30 + interrupt-parent = <&intc>;
  31 + status = "disabled";
  32 + };
  33 +
  34 +(or)
  35 +
  36 + dcan1: d_can@481d0000 {
  37 + compatible = "bosch,d_can";
  38 + ti,hwmods = "d_can1";
  39 + reg = <0x481d0000 0x2000>;
  40 + interrupts = <55>;
  41 + interrupt-parent = <&intc>;
  42 + status = "disabled";
  43 + };
  44 +
  45 +Step 2: board specific .dts file
  46 +
  47 + &dcan1 {
  48 + status = "okay";
  49 + };
109 Documentation/devicetree/bindings/net/cpsw.txt
... ... @@ -0,0 +1,109 @@
  1 +TI SoC Ethernet Switch Controller Device Tree Bindings
  2 +------------------------------------------------------
  3 +
  4 +Required properties:
  5 +- compatible : Should be "ti,cpsw"
  6 +- reg : physical base address and size of the cpsw
  7 + registers map
  8 +- interrupts : property with a value describing the interrupt
  9 + number
  10 +- interrupt-parent : The parent interrupt controller
  11 +- cpdma_channels : Specifies number of channels in CPDMA
  12 +- host_port_no : Specifies host port shift
  13 +- cpdma_reg_ofs : Specifies CPDMA submodule register offset
  14 +- cpdma_sram_ofs : Specifies CPDMA SRAM offset
  15 +- ale_reg_ofs : Specifies ALE submodule register offset
  16 +- ale_entries : Specifies No of entries ALE can hold
  17 +- host_port_reg_ofs : Specifies host port register offset
  18 +- hw_stats_reg_ofs : Specifies hardware statistics register offset
  19 +- bd_ram_ofs : Specifies internal desciptor RAM offset
  20 +- bd_ram_size : Specifies internal descriptor RAM size
  21 +- rx_descs : Specifies number of Rx descriptors
  22 +- mac_control : Specifies Default MAC control register content
  23 + for the specific platform
  24 +- slaves : Specifies number for slaves
  25 +- slave_reg_ofs : Specifies slave register offset
  26 +- sliver_reg_ofs : Specifies slave sliver register offset
  27 +- phy_id : Specifies slave phy id
  28 +- mac-address : Specifies slave MAC address
  29 +
  30 +Optional properties:
  31 +- ti,hwmods : Must be "cpgmac0"
  32 +- no_bd_ram : Must be 0 or 1
  33 +
  34 +Note: "ti,hwmods" field is used to fetch the base address and irq
  35 +resources from TI, omap hwmod data base during device registration.
  36 +Future plan is to migrate hwmod data base contents into device tree
  37 +blob so that, all the required data will be used from device tree dts
  38 +file.
  39 +
  40 +Examples:
  41 +
  42 + mac: ethernet@4A100000 {
  43 + compatible = "ti,cpsw";
  44 + reg = <0x4A100000 0x1000>;
  45 + interrupts = <55 0x4>;
  46 + interrupt-parent = <&intc>;
  47 + cpdma_channels = <8>;
  48 + host_port_no = <0>;
  49 + cpdma_reg_ofs = <0x800>;
  50 + cpdma_sram_ofs = <0xa00>;
  51 + ale_reg_ofs = <0xd00>;
  52 + ale_entries = <1024>;
  53 + host_port_reg_ofs = <0x108>;
  54 + hw_stats_reg_ofs = <0x900>;
  55 + bd_ram_ofs = <0x2000>;
  56 + bd_ram_size = <0x2000>;
  57 + no_bd_ram = <0>;
  58 + rx_descs = <64>;
  59 + mac_control = <0x20>;
  60 + slaves = <2>;
  61 + cpsw_emac0: slave@0 {
  62 + slave_reg_ofs = <0x208>;
  63 + sliver_reg_ofs = <0xd80>;
  64 + phy_id = "davinci_mdio.16:00";
  65 + /* Filled in by U-Boot */
  66 + mac-address = [ 00 00 00 00 00 00 ];
  67 + };
  68 + cpsw_emac1: slave@1 {
  69 + slave_reg_ofs = <0x308>;
  70 + sliver_reg_ofs = <0xdc0>;
  71 + phy_id = "davinci_mdio.16:01";
  72 + /* Filled in by U-Boot */
  73 + mac-address = [ 00 00 00 00 00 00 ];
  74 + };
  75 + };
  76 +
  77 +(or)
  78 + mac: ethernet@4A100000 {
  79 + compatible = "ti,cpsw";
  80 + ti,hwmods = "cpgmac0";
  81 + cpdma_channels = <8>;
  82 + host_port_no = <0>;
  83 + cpdma_reg_ofs = <0x800>;
  84 + cpdma_sram_ofs = <0xa00>;
  85 + ale_reg_ofs = <0xd00>;
  86 + ale_entries = <1024>;
  87 + host_port_reg_ofs = <0x108>;
  88 + hw_stats_reg_ofs = <0x900>;
  89 + bd_ram_ofs = <0x2000>;
  90 + bd_ram_size = <0x2000>;
  91 + no_bd_ram = <0>;
  92 + rx_descs = <64>;
  93 + mac_control = <0x20>;
  94 + slaves = <2>;
  95 + cpsw_emac0: slave@0 {
  96 + slave_reg_ofs = <0x208>;
  97 + sliver_reg_ofs = <0xd80>;
  98 + phy_id = "davinci_mdio.16:00";
  99 + /* Filled in by U-Boot */
  100 + mac-address = [ 00 00 00 00 00 00 ];
  101 + };
  102 + cpsw_emac1: slave@1 {
  103 + slave_reg_ofs = <0x308>;
  104 + sliver_reg_ofs = <0xdc0>;
  105 + phy_id = "davinci_mdio.16:01";
  106 + /* Filled in by U-Boot */
  107 + mac-address = [ 00 00 00 00 00 00 ];
  108 + };
  109 + };
33 Documentation/devicetree/bindings/net/davinci-mdio.txt
... ... @@ -0,0 +1,33 @@
  1 +TI SoC Davinci MDIO Controller Device Tree Bindings
  2 +---------------------------------------------------
  3 +
  4 +Required properties:
  5 +- compatible : Should be "ti,davinci_mdio"
  6 +- reg : physical base address and size of the davinci mdio
  7 + registers map
  8 +- bus_freq : Mdio Bus frequency
  9 +
  10 +Optional properties:
  11 +- ti,hwmods : Must be "davinci_mdio"
  12 +
  13 +Note: "ti,hwmods" field is used to fetch the base address and irq
  14 +resources from TI, omap hwmod data base during device registration.
  15 +Future plan is to migrate hwmod data base contents into device tree
  16 +blob so that, all the required data will be used from device tree dts
  17 +file.
  18 +
  19 +Examples:
  20 +
  21 + mdio: davinci_mdio@4A101000 {
  22 + compatible = "ti,cpsw";
  23 + reg = <0x4A101000 0x1000>;
  24 + bus_freq = <1000000>;
  25 + };
  26 +
  27 +(or)
  28 +
  29 + mdio: davinci_mdio@4A101000 {
  30 + compatible = "ti,cpsw";
  31 + ti,hwmods = "davinci_mdio";
  32 + bus_freq = <1000000>;
  33 + };
75 Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt
... ... @@ -0,0 +1,75 @@
  1 +Properties for an MDIO bus multiplexer controlled by a memory-mapped device
  2 +
  3 +This is a special case of a MDIO bus multiplexer. A memory-mapped device,
  4 +like an FPGA, is used to control which child bus is connected. The mdio-mux
  5 +node must be a child of the memory-mapped device. The driver currently only
  6 +supports devices with eight-bit registers.
  7 +
  8 +Required properties in addition to the generic multiplexer properties:
  9 +
  10 +- compatible : string, must contain "mdio-mux-mmioreg"
  11 +
  12 +- reg : integer, contains the offset of the register that controls the bus
  13 + multiplexer. The size field in the 'reg' property is the size of
  14 + register, and must therefore be 1.
  15 +
  16 +- mux-mask : integer, contains an eight-bit mask that specifies which
  17 + bits in the register control the actual bus multiplexer. The
  18 + 'reg' property of each child mdio-mux node must be constrained by
  19 + this mask.
  20 +
  21 +Example:
  22 +
  23 +The FPGA node defines a memory-mapped FPGA with a register space of 0x30 bytes.
  24 +For the "EMI2" MDIO bus, register 9 (BRDCFG1) controls the mux on that bus.
  25 +A bitmask of 0x6 means that bits 1 and 2 (bit 0 is lsb) are the bits on
  26 +BRDCFG1 that control the actual mux.
  27 +
  28 + /* The FPGA node */
  29 + fpga: board-control@3,0 {
  30 + #address-cells = <1>;
  31 + #size-cells = <1>;
  32 + compatible = "fsl,p5020ds-fpga", "fsl,fpga-ngpixis";
  33 + reg = <3 0 0x30>;
  34 + ranges = <0 3 0 0x30>;
  35 +
  36 + mdio-mux-emi2 {
  37 + compatible = "mdio-mux-mmioreg", "mdio-mux";
  38 + mdio-parent-bus = <&xmdio0>;
  39 + #address-cells = <1>;
  40 + #size-cells = <0>;
  41 + reg = <9 1>; // BRDCFG1
  42 + mux-mask = <0x6>; // EMI2
  43 +
  44 + emi2_slot1: mdio@0 { // Slot 1 XAUI (FM2)
  45 + reg = <0>;
  46 + #address-cells = <1>;
  47 + #size-cells = <0>;
  48 +
  49 + phy_xgmii_slot1: ethernet-phy@0 {
  50 + compatible = "ethernet-phy-ieee802.3-c45";
  51 + reg = <4>;
  52 + };
  53 + };
  54 +
  55 + emi2_slot2: mdio@2 { // Slot 2 XAUI (FM1)
  56 + reg = <2>;
  57 + #address-cells = <1>;
  58 + #size-cells = <0>;
  59 +
  60 + phy_xgmii_slot2: ethernet-phy@4 {
  61 + compatible = "ethernet-phy-ieee802.3-c45";
  62 + reg = <0>;
  63 + };
  64 + };
  65 + };
  66 + };
  67 +
  68 + /* The parent MDIO bus. */
  69 + xmdio0: mdio@f1000 {
  70 + #address-cells = <1>;
  71 + #size-cells = <0>;
  72 + compatible = "fsl,fman-xmdio";
  73 + reg = <0xf1000 0x1000>;
  74 + interrupts = <100 1 0 0>;
  75 + };
10 Documentation/filesystems/nfs/nfsroot.txt
@@ -78,7 +78,8 @@ nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
78 78 flags = hard, nointr, noposix, cto, ac
79 79
80 80
81   -ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
  81 +ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>:
  82 + <dns0-ip>:<dns1-ip>
82 83
83 84 This parameter tells the kernel how to configure IP addresses of devices
84 85 and also how to set up the IP routing table. It was originally called
@@ -158,6 +159,13 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
158 159
159 160 Default: any
160 161
  162 + <dns0-ip> IP address of first nameserver.
  163 + Value gets exported by /proc/net/pnp which is often linked
  164 + on embedded systems by /etc/resolv.conf.
  165 +
  166 + <dns1-ip> IP address of secound nameserver.
  167 + Same as above.
  168 +
161 169
162 170 nfsrootdebug
163 171
3  Documentation/infiniband/ipoib.txt
@@ -24,6 +24,9 @@ Partitions and P_Keys
24 24 The P_Key for any interface is given by the "pkey" file, and the
25 25 main interface for a subinterface is in "parent."
26 26
  27 + Child interface create/delete can also be done using IPoIB's
  28 + rtnl_link_ops, where childs created using either way behave the same.
  29 +
27 30 Datagram vs Connected modes
28 31
29 32 The IPoIB driver supports two modes of operation: datagram and
7 Documentation/networking/batman-adv.txt
@@ -75,9 +75,10 @@ folder:
75 75
76 76 There is a special folder for debugging information:
77 77
78   -# ls /sys/kernel/debug/batman_adv/bat0/
79   -# bla_claim_table log socket transtable_local
80   -# gateways originators transtable_global vis_data
  78 +# ls /sys/kernel/debug/batman_adv/bat0/
  79 +# bla_backbone_table log transtable_global
  80 +# bla_claim_table originators transtable_local
  81 +# gateways socket vis_data
81 82
82 83 Some of the files contain all sort of status information regard-
83 84 ing the mesh network. For example, you can view the table of
30 Documentation/networking/bonding.txt
@@ -752,12 +752,22 @@ xmit_hash_policy
752 752 protocol information to generate the hash.
753 753
754 754 Uses XOR of hardware MAC addresses and IP addresses to
755   - generate the hash. The formula is
  755 + generate the hash. The IPv4 formula is
756 756
757 757 (((source IP XOR dest IP) AND 0xffff) XOR
758 758 ( source MAC XOR destination MAC ))
759 759 modulo slave count
760 760
  761 + The IPv6 formula is
  762 +
  763 + hash = (source ip quad 2 XOR dest IP quad 2) XOR
  764 + (source ip quad 3 XOR dest IP quad 3) XOR
  765 + (source ip quad 4 XOR dest IP quad 4)
  766 +
  767 + (((hash >> 24) XOR (hash >> 16) XOR (hash >> 8) XOR hash)
  768 + XOR (source MAC XOR destination MAC))
  769 + modulo slave count
  770 +
761 771 This algorithm will place all traffic to a particular
762 772 network peer on the same slave. For non-IP traffic,
763 773 the formula is the same as for the layer2 transmit
@@ -778,19 +788,29 @@ xmit_hash_policy
778 788 slaves, although a single connection will not span
779 789 multiple slaves.
780 790
781   - The formula for unfragmented TCP and UDP packets is
  791 + The formula for unfragmented IPv4 TCP and UDP packets is
782 792
783 793 ((source port XOR dest port) XOR
784 794 ((source IP XOR dest IP) AND 0xffff)
785 795 modulo slave count
786 796
787   - For fragmented TCP or UDP packets and all other IP
788   - protocol traffic, the source and destination port
  797 + The formula for unfragmented IPv6 TCP and UDP packets is
  798 +
  799 + hash = (source port XOR dest port) XOR
  800 + ((source ip quad 2 XOR dest IP quad 2) XOR
  801 + (source ip quad 3 XOR dest IP quad 3) XOR
  802 + (source ip quad 4 XOR dest IP quad 4))
  803 +
  804 + ((hash >> 24) XOR (hash >> 16) XOR (hash >> 8) XOR hash)
  805 + modulo slave count
  806 +
  807 + For fragmented TCP or UDP packets and all other IPv4 and
  808 + IPv6 protocol traffic, the source and destination port
789 809 information is omitted. For non-IP traffic, the
790 810 formula is the same as for the layer2 transmit hash
791 811 policy.
792 812
793   - This policy is intended to mimic the behavior of
  813 + The IPv4 policy is intended to mimic the behavior of
794 814 certain switches, notably Cisco switches with PFC2 as
795 815 well as some Foundry and IBM products.
796 816
37 Documentation/networking/ip-sysctl.txt
@@ -439,7 +439,9 @@ tcp_stdurg - BOOLEAN
439 439 tcp_synack_retries - INTEGER
440 440 Number of times SYNACKs for a passive TCP connection attempt will
441 441 be retransmitted. Should not be higher than 255. Default value
442   - is 5, which corresponds to ~180seconds.
  442 + is 5, which corresponds to 31seconds till the last retransmission
  443 + with the current initial RTO of 1second. With this the final timeout
  444 + for a passive TCP connection will happen after 63seconds.
443 445
444 446 tcp_syncookies - BOOLEAN
445 447 Only valid when the kernel was compiled with CONFIG_SYNCOOKIES
@@ -465,20 +467,37 @@ tcp_syncookies - BOOLEAN
465 467 tcp_fastopen - INTEGER
466 468 Enable TCP Fast Open feature (draft-ietf-tcpm-fastopen) to send data
467 469 in the opening SYN packet. To use this feature, the client application
468   - must not use connect(). Instead, it should use sendmsg() or sendto()
469   - with MSG_FASTOPEN flag which performs a TCP handshake automatically.
470   -
471   - The values (bitmap) are:
472   - 1: Enables sending data in the opening SYN on the client
473   - 5: Enables sending data in the opening SYN on the client regardless
474   - of cookie availability.
  470 + must use sendmsg() or sendto() with MSG_FASTOPEN flag rather than
  471 + connect() to perform a TCP handshake automatically.
  472 +
  473 + The values (bitmap) are
  474 + 1: Enables sending data in the opening SYN on the client.
  475 + 2: Enables TCP Fast Open on the server side, i.e., allowing data in
  476 + a SYN packet to be accepted and passed to the application before
  477 + 3-way hand shake finishes.
  478 + 4: Send data in the opening SYN regardless of cookie availability and
  479 + without a cookie option.
  480 + 0x100: Accept SYN data w/o validating the cookie.
  481 + 0x200: Accept data-in-SYN w/o any cookie option present.
  482 + 0x400/0x800: Enable Fast Open on all listeners regardless of the
  483 + TCP_FASTOPEN socket option. The two different flags designate two
  484 + different ways of setting max_qlen without the TCP_FASTOPEN socket
  485 + option.
475 486
476 487 Default: 0
477 488
  489 + Note that the client & server side Fast Open flags (1 and 2
  490 + respectively) must be also enabled before the rest of flags can take
  491 + effect.
  492 +
  493 + See include/net/tcp.h and the code for more details.
  494 +
478 495 tcp_syn_retries - INTEGER
479 496 Number of times initial SYNs for an active TCP connection attempt
480 497 will be retransmitted. Should not be higher than 255. Default value
481   - is 5, which corresponds to ~180seconds.
  498 + is 6, which corresponds to 63seconds till the last restransmission
  499 + with the current initial RTO of 1second. With this the final timeout
  500 + for an active TCP connection attempt will happen after 127seconds.
482 501
483 502 tcp_timestamps - BOOLEAN
484 503 Enable timestamps as defined in RFC1323.
5 Documentation/networking/stmmac.txt
@@ -173,7 +173,6 @@ Where:
173 173 For MDIO bus The we have:
174 174
175 175 struct stmmac_mdio_bus_data {
176   - int bus_id;
177 176 int (*phy_reset)(void *priv);
178 177 unsigned int phy_mask;
179 178 int *irqs;
@@ -181,7 +180,6 @@ For MDIO bus The we have:
181 180 };
182 181
183 182 Where:
184   - o bus_id: bus identifier;
185 183 o phy_reset: hook to reset the phy device attached to the bus.
186 184 o phy_mask: phy mask passed when register the MDIO bus within the driver.
187 185 o irqs: list of IRQs, one per PHY.
@@ -230,9 +228,6 @@ there are two MAC cores: one MAC is for MDIO Bus/PHY emulation
230 228 with fixed_link support.
231 229
232 230 static struct stmmac_mdio_bus_data stmmac1_mdio_bus = {
233   - .bus_id = 1,
234   - |
235   - |-> phy device on the bus_id 1
236 231 .phy_reset = phy_reset;
237 232 |
238 233 |-> function to provide the phy_reset on this board
47 Documentation/networking/vxlan.txt
... ... @@ -0,0 +1,47 @@
  1 +Virtual eXtensible Local Area Networking documentation
  2 +======================================================
  3 +
  4 +The VXLAN protocol is a tunnelling protocol that is designed to
  5 +solve the problem of limited number of available VLAN's (4096).
  6 +With VXLAN identifier is expanded to 24 bits.
  7 +
  8 +It is a draft RFC standard, that is implemented by Cisco Nexus,
  9 +Vmware and Brocade. The protocol runs over UDP using a single
  10 +destination port (still not standardized by IANA).
  11 +This document describes the Linux kernel tunnel device,
  12 +there is also an implantation of VXLAN for Openvswitch.
  13 +
  14 +Unlike most tunnels, a VXLAN is a 1 to N network, not just point
  15 +to point. A VXLAN device can either dynamically learn the IP address
  16 +of the other end, in a manner similar to a learning bridge, or the
  17 +forwarding entries can be configured statically.
  18 +
  19 +The management of vxlan is done in a similar fashion to it's
  20 +too closest neighbors GRE and VLAN. Configuring VXLAN requires
  21 +the version of iproute2 that matches the kernel release
  22 +where VXLAN was first merged upstream.
  23 +
  24 +1. Create vxlan device
  25 + # ip li add vxlan0 type vxlan id 42 group 239.1.1.1 dev eth1
  26 +
  27 +This creates a new device (vxlan0). The device uses the
  28 +the multicast group 239.1.1.1 over eth1 to handle packets where
  29 +no entry is in the forwarding table.
  30 +
  31 +2. Delete vxlan device
  32 + # ip link delete vxlan0
  33 +
  34 +3. Show vxlan info
  35 + # ip -d show vxlan0
  36 +
  37 +It is possible to create, destroy and display the vxlan
  38 +forwarding table using the new bridge command.
  39 +
  40 +1. Create forwarding table entry
  41 + # bridge fdb add to 00:17:42:8a:b4:05 dst 192.19.0.2 dev vxlan0
  42 +
  43 +2. Delete forwarding table entry
  44 + # bridge fdb delete 00:17:42:8a:b4:05
  45 +
  46 +3. Show forwarding table
  47 + # bridge fdb show dev vxlan0
1  MAINTAINERS
@@ -4806,6 +4806,7 @@ M: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
4806 4806 M: Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
4807 4807 M: Samuel Ortiz <sameo@linux.intel.com>
4808 4808 L: linux-wireless@vger.kernel.org
  4809 +L: linux-nfc@lists.01.org (moderated for non-subscribers)
4809 4810 S: Maintained
4810 4811 F: net/nfc/
4811 4812 F: include/linux/nfc.h
1  arch/m68k/configs/amiga_defconfig
@@ -67,7 +67,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
67 67 CONFIG_NETFILTER_XT_TARGET_MARK=m
68 68 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
69 69 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
70   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
71 70 CONFIG_NETFILTER_XT_TARGET_TRACE=m
72 71 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
73 72 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/apollo_defconfig
@@ -67,7 +67,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
67 67 CONFIG_NETFILTER_XT_TARGET_MARK=m
68 68 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
69 69 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
70   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
71 70 CONFIG_NETFILTER_XT_TARGET_TRACE=m
72 71 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
73 72 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/atari_defconfig
@@ -65,7 +65,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
65 65 CONFIG_NETFILTER_XT_TARGET_MARK=m
66 66 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
67 67 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
68   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
69 68 CONFIG_NETFILTER_XT_TARGET_TRACE=m
70 69 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
71 70 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/bvme6000_defconfig
@@ -65,7 +65,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
65 65 CONFIG_NETFILTER_XT_TARGET_MARK=m
66 66 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
67 67 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
68   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
69 68 CONFIG_NETFILTER_XT_TARGET_TRACE=m
70 69 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
71 70 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/hp300_defconfig
@@ -66,7 +66,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
66 66 CONFIG_NETFILTER_XT_TARGET_MARK=m
67 67 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
68 68 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
69   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
70 69 CONFIG_NETFILTER_XT_TARGET_TRACE=m
71 70 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
72 71 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/mac_defconfig
@@ -61,7 +61,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
61 61 CONFIG_NETFILTER_XT_TARGET_MARK=m
62 62 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
63 63 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
64   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
65 64 CONFIG_NETFILTER_XT_TARGET_TRACE=m
66 65 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
67 66 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/multi_defconfig
@@ -80,7 +80,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
80 80 CONFIG_NETFILTER_XT_TARGET_MARK=m
81 81 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
82 82 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
83   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
84 83 CONFIG_NETFILTER_XT_TARGET_TRACE=m
85 84 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
86 85 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/mvme147_defconfig
@@ -64,7 +64,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
64 64 CONFIG_NETFILTER_XT_TARGET_MARK=m
65 65 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
66 66 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
67   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
68 67 CONFIG_NETFILTER_XT_TARGET_TRACE=m
69 68 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
70 69 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/mvme16x_defconfig
@@ -65,7 +65,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
65 65 CONFIG_NETFILTER_XT_TARGET_MARK=m
66 66 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
67 67 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
68   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
69 68 CONFIG_NETFILTER_XT_TARGET_TRACE=m
70 69 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
71 70 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/q40_defconfig
@@ -61,7 +61,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
61 61 CONFIG_NETFILTER_XT_TARGET_MARK=m
62 62 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
63 63 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
64   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
65 64 CONFIG_NETFILTER_XT_TARGET_TRACE=m
66 65 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
67 66 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/sun3_defconfig
@@ -62,7 +62,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
62 62 CONFIG_NETFILTER_XT_TARGET_MARK=m
63 63 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
64 64 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
65   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
66 65 CONFIG_NETFILTER_XT_TARGET_TRACE=m
67 66 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
68 67 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/m68k/configs/sun3x_defconfig
@@ -62,7 +62,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
62 62 CONFIG_NETFILTER_XT_TARGET_MARK=m
63 63 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
64 64 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
65   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
66 65 CONFIG_NETFILTER_XT_TARGET_TRACE=m
67 66 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
68 67 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/mips/configs/ar7_defconfig
@@ -56,7 +56,6 @@ CONFIG_NF_CONNTRACK_MARK=y
56 56 CONFIG_NF_CONNTRACK_FTP=m
57 57 CONFIG_NF_CONNTRACK_IRC=m
58 58 CONFIG_NF_CONNTRACK_TFTP=m
59   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
60 59 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
61 60 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
62 61 CONFIG_NETFILTER_XT_MATCH_MAC=m
1  arch/mips/configs/bcm47xx_defconfig
@@ -96,7 +96,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
96 96 CONFIG_NETFILTER_XT_TARGET_MARK=m
97 97 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
98 98 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
99   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
100 99 CONFIG_NETFILTER_XT_TARGET_TRACE=m
101 100 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
102 101 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
1  arch/mips/configs/ip22_defconfig
@@ -87,7 +87,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
87 87 CONFIG_NETFILTER_XT_TARGET_MARK=m
88 88 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
89 89 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
90   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
91 90 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
92 91 CONFIG_NETFILTER_XT_TARGET_TRACE=m
93 92 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
1  arch/mips/configs/jazz_defconfig
@@ -60,7 +60,6 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
60 60 CONFIG_NETFILTER_XT_TARGET_MARK=m
61 61 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
62 62 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
63   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
64 63 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
65 64 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
66 65 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
1  arch/mips/configs/malta_defconfig
@@ -86,7 +86,6 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
86 86 CONFIG_NETFILTER_XT_TARGET_MARK=m
87 87 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
88 88 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
89   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
90 89 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
91 90 CONFIG_NETFILTER_XT_TARGET_TRACE=m
92 91 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
1  arch/mips/configs/markeins_defconfig
@@ -59,7 +59,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
59 59 CONFIG_NETFILTER_XT_TARGET_MARK=m
60 60 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
61 61 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
62   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
63 62 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
64 63 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
65 64 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
1  arch/mips/configs/nlm_xlp_defconfig
@@ -108,7 +108,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
108 108 CONFIG_NETFILTER_XT_TARGET_MARK=m
109 109 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
110 110 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
111   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
112 111 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
113 112 CONFIG_NETFILTER_XT_TARGET_TRACE=m
114 113 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
1  arch/mips/configs/nlm_xlr_defconfig
@@ -109,7 +109,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
109 109 CONFIG_NETFILTER_XT_TARGET_MARK=m
110 110 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
111 111 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
112   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
113 112 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
114 113 CONFIG_NETFILTER_XT_TARGET_TRACE=m
115 114 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
1  arch/mips/configs/rm200_defconfig
@@ -68,7 +68,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
68 68 CONFIG_NETFILTER_XT_TARGET_MARK=m
69 69 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
70 70 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
71   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
72 71 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
73 72 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
74 73 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
1  arch/powerpc/configs/pmac32_defconfig
@@ -55,7 +55,6 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
55 55 CONFIG_NETFILTER_XT_TARGET_MARK=m
56 56 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
57 57 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
58   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
59 58 CONFIG_NETFILTER_XT_TARGET_TRACE=m
60 59 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
61 60 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
1  arch/powerpc/configs/ppc64_defconfig
@@ -92,7 +92,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
92 92 CONFIG_NETFILTER_XT_TARGET_MARK=m
93 93 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
94 94 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
95   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
96 95 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
97 96 CONFIG_NETFILTER_XT_TARGET_TRACE=m
98 97 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
1  arch/powerpc/configs/ppc64e_defconfig
@@ -66,7 +66,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
66 66 CONFIG_NETFILTER_XT_TARGET_MARK=m
67 67 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
68 68 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
69   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
70 69 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
71 70 CONFIG_NETFILTER_XT_TARGET_TRACE=m
72 71 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
1  arch/powerpc/configs/ppc6xx_defconfig
@@ -167,7 +167,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
167 167 CONFIG_NETFILTER_XT_TARGET_MARK=m
168 168 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
169 169 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
170   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
171 170 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
172 171 CONFIG_NETFILTER_XT_TARGET_TRACE=m
173 172 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
4 arch/sparc/net/bpf_jit_comp.c
@@ -464,8 +464,12 @@ void bpf_jit_compile(struct sk_filter *fp)
464 464 emit_alu_K(OR, K);
465 465 break;
466 466 case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
  467 + case BPF_S_ALU_XOR_X:
467 468 emit_alu_X(XOR);
468 469 break;
  470 + case BPF_S_ALU_XOR_K: /* A ^= K */
  471 + emit_alu_K(XOR, K);
  472 + break;
469 473 case BPF_S_ALU_LSH_X: /* A <<= X */
470 474 emit_alu_X(SLL);
471 475 break;
1  arch/tile/configs/tilegx_defconfig
@@ -134,7 +134,6 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
134 134 CONFIG_NETFILTER_XT_TARGET_MARK=m
135 135 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
136 136 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
137   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
138 137 CONFIG_NETFILTER_XT_TARGET_TEE=m
139 138 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
140 139 CONFIG_NETFILTER_XT_TARGET_TRACE=m
1  arch/tile/configs/tilepro_defconfig
@@ -132,7 +132,6 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
132 132 CONFIG_NETFILTER_XT_TARGET_MARK=m
133 133 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
134 134 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
135   -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
136 135 CONFIG_NETFILTER_XT_TARGET_TEE=m
137 136 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
138 137 CONFIG_NETFILTER_XT_TARGET_TRACE=m
34 arch/x86/net/bpf_jit_comp.c
@@ -280,6 +280,31 @@ void bpf_jit_compile(struct sk_filter *fp)
280 280 }
281 281 EMIT4(0x31, 0xd2, 0xf7, 0xf3); /* xor %edx,%edx; div %ebx */
282 282 break;
  283 + case BPF_S_ALU_MOD_X: /* A %= X; */
  284 + seen |= SEEN_XREG;
  285 + EMIT2(0x85, 0xdb); /* test %ebx,%ebx */
  286 + if (pc_ret0 > 0) {
  287 + /* addrs[pc_ret0 - 1] is start address of target
  288 + * (addrs[i] - 6) is the address following this jmp
  289 + * ("xor %edx,%edx; div %ebx;mov %edx,%eax" being 6 bytes long)
  290 + */
  291 + EMIT_COND_JMP(X86_JE, addrs[pc_ret0 - 1] -
  292 + (addrs[i] - 6));
  293 + } else {
  294 + EMIT_COND_JMP(X86_JNE, 2 + 5);
  295 + CLEAR_A();
  296 + EMIT1_off32(0xe9, cleanup_addr - (addrs[i] - 6)); /* jmp .+off32 */
  297 + }
  298 + EMIT2(0x31, 0xd2); /* xor %edx,%edx */
  299 + EMIT2(0xf7, 0xf3); /* div %ebx */
  300 + EMIT2(0x89, 0xd0); /* mov %edx,%eax */
  301 + break;
  302 + case BPF_S_ALU_MOD_K: /* A %= K; */
  303 + EMIT2(0x31, 0xd2); /* xor %edx,%edx */
  304 + EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
  305 + EMIT2(0xf7, 0xf1); /* div %ecx */
  306 + EMIT2(0x89, 0xd0); /* mov %edx,%eax */
  307 + break;
283 308 case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
284 309 EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */
285 310 EMIT(K, 4);
@@ -310,9 +335,18 @@ void bpf_jit_compile(struct sk_filter *fp)
310 335 EMIT1_off32(0x0d, K); /* or imm32,%eax */
311 336 break;
312 337 case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
  338 + case BPF_S_ALU_XOR_X:
313 339 seen |= SEEN_XREG;
314 340 EMIT2(0x31, 0xd8); /* xor %ebx,%eax */
315 341 break;
  342 + case BPF_S_ALU_XOR_K: /* A ^= K; */
  343 + if (K == 0)
  344 + break;
  345 + if (is_imm8(K))
  346 + EMIT3(0x83, 0xf0, K); /* xor imm8,%eax */
  347 + else
  348 + EMIT1_off32(0x35, K); /* xor imm32,%eax */
  349 + break;
316 350 case BPF_S_ALU_LSH_X: /* A <<= X; */
317 351 seen |= SEEN_XREG;
318 352 EMIT4(0x89, 0xd9, 0xd3, 0xe0); /* mov %ebx,%ecx; shl %cl,%eax */
7 crypto/crypto_user.c
@@ -166,7 +166,7 @@ static int crypto_report_alg(struct crypto_alg *alg,
166 166 struct crypto_user_alg *ualg;
167 167 int err = 0;
168 168
169   - nlh = nlmsg_put(skb, NETLINK_CB(in_skb).pid, info->nlmsg_seq,
  169 + nlh = nlmsg_put(skb, NETLINK_CB(in_skb).portid, info->nlmsg_seq,
170 170 CRYPTO_MSG_GETALG, sizeof(*ualg), info->nlmsg_flags);
171 171 if (!nlh) {
172 172 err = -EMSGSIZE;
@@ -216,7 +216,7 @@ static int crypto_report(struct sk_buff *in_skb, struct nlmsghdr *in_nlh,
216 216 if (err)
217 217 return err;
218 218
219   - return nlmsg_unicast(crypto_nlsk, skb, NETLINK_CB(in_skb).pid);
  219 + return nlmsg_unicast(crypto_nlsk, skb, NETLINK_CB(in_skb).portid);
220 220 }
221 221
222 222 static int crypto_dump_report(struct sk_buff *skb, struct netlink_callback *cb)
@@ -500,8 +500,7 @@ static int __init crypto_user_init(void)
500 500 .input = crypto_netlink_rcv,
501 501 };
502 502
503   - crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO,
504   - THIS_MODULE, &cfg);
  503 + crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO, &cfg);
505 504 if (!crypto_nlsk)
506 505 return -ENOMEM;
507 506
1  drivers/Makefile
@@ -123,7 +123,6 @@ obj-$(CONFIG_VHOST_NET) += vhost/
123 123 obj-$(CONFIG_VLYNQ) += vlynq/
124 124 obj-$(CONFIG_STAGING) += staging/
125