Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00c845db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) Fix NBMA tunnel mac header handling in GRE, from Timo Teräs.

 2) Fix a NAPI race in the fec driver, from Nimrod Andy.

 3) The new IFF_VNET_LE bit is outside the size of the flags member it
    is stored in (which is 16-bits), store the state locally in the
    drivers.  From Michael S Tsirkin.

 4) We are kicking the tires with the new wireless maintainership
    situation.  Bluetooth fixes via Johan Hedberg, and mac80211 fixes
    from Johannes Berg.

 5) Fix locking and leaks in geneve driver, from Jesse Gross.

 6) Make netlink TX mmap code always copy, so we don't have to be
    potentially exposed to the user changing the underlying contents
    from underneath us.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (63 commits)
  be2net: Fix incorrect setting of tunnel offload flag in netdev features
  bnx2x: fix typos in "configure"
  xen-netback: support frontends without feature-rx-notify again
  MAINTAINERS: changes for wireless
  cxgb4: Fix decoding QSA module for ethtool get settings
  geneve: Fix races between socket add and release.
  geneve: Remove socket and offload handlers at destruction.
  netlink: Don't reorder loads/stores before marking mmap netlink frame as available
  netlink: Always copy on mmap TX.
  Bluetooth: Fix bug with filter in service discovery optimization
  mac80211: free management frame keys when removing station
  net: Disallow providing non zero VLAN ID for NIC drivers FDB add flow
  net/mlx4: Cache line CQE/EQE stride fixes
  net: fec: Fix NAPI race
  xen-netfront: use napi_complete() correctly to prevent Rx stalling
  ip_tunnel: Add missing validation of encap type to ip_tunnel_encap_setup()
  ip_tunnel: Add sanity checks to ip_tunnel_encap_add_ops()
  net: Allow FIXED_PHY to be modular.
  if_tun: drop broken IFF_VNET_LE
  macvtap: drop broken IFF_VNET_LE
  ...
parents 28ee5809 86c8fc4b

Documentation/networking/fib_trie.txt

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ trie_leaf_remove() 


trie_rebalance()

	The key function for the dynamic trie after any change in the trie

	it is run to optimize and reorganize. Tt will walk the trie upwards 

	it is run to optimize and reorganize. It will walk the trie upwards

	towards the root from a given tnode, doing a resize() at each step

	to implement level compression.

MAINTAINERS

+8 −11
Original line number Diff line number Diff line
@@ -6610,19 +6610,8 @@ L: netdev@vger.kernel.org 
S:	Maintained



NETWORKING [WIRELESS]

M:	"John W. Linville" <linville@tuxdriver.com>

L:	linux-wireless@vger.kernel.org

Q:	http://patchwork.kernel.org/project/linux-wireless/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git

S:	Maintained

F:	net/mac80211/

F:	net/rfkill/

F:	net/wireless/

F:	include/net/ieee80211*

F:	include/linux/wireless.h

F:	include/uapi/linux/wireless.h

F:	include/net/iw_handler.h

F:	drivers/net/wireless/



NETWORKING DRIVERS

L:	netdev@vger.kernel.org
@@ -6643,6 +6632,14 @@ F: include/linux/inetdevice.h 
F:	include/uapi/linux/if_*

F:	include/uapi/linux/netdevice.h



NETWORKING DRIVERS (WIRELESS)

M:	Kalle Valo <kvalo@codeaurora.org>

L:	linux-wireless@vger.kernel.org

Q:	http://patchwork.kernel.org/project/linux-wireless/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/

S:	Maintained

F:	drivers/net/wireless/



NETXEN (1/10) GbE SUPPORT

M:	Manish Chopra <manish.chopra@qlogic.com>

M:	Sony Chacko <sony.chacko@qlogic.com>

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x04CA, 0x3007) },

	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x04CA, 0x300b) },

	{ USB_DEVICE(0x04CA, 0x3010) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x0220) },

	{ USB_DEVICE(0x0930, 0x0227) },
@@ -140,6 +141,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },

drivers/net/dsa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ config NET_DSA_BCM_SF2 
	depends on HAS_IOMEM

	select NET_DSA

	select NET_DSA_TAG_BRCM

	select FIXED_PHY if NET_DSA_BCM_SF2=y

	select FIXED_PHY

	select BCM7XXX_PHY

	select MDIO_BCM_UNIMAC

	---help---