Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (1f6a563e) · Commits · 戴 / test

Pull networking fixes from David Miller: 1) Segregate namespaces properly in conntrack dumps, from Liping Zhang. 2) tcp listener refcount fix in netfilter tproxy, from Eric Dumazet. 3) Fix timeouts in qed driver due to xmit_more, from Yuval Mintz. 4) Fix use-after-free in tcp_xmit_retransmit_queue(). 5) Userspace header fixups (use of __u32, missing includes, etc.) from Mikko Rapeli. 6) Further refinements to fragmentation wrt gso and tunnels, from Shmulik Ladkani. 7) Trigger poll correctly for zero length UDP packets, from Eric Dumazet. 8) TCP window scaling fix, also from Eric Dumazet. 9) SLAB_DESTROY_BY_RCU is not relevant any more for UDP sockets. 10) Module refcount leak in qdisc_create_dflt(), from Eric Dumazet. 11) Fix deadlock in cp_rx_poll() of 8139cp driver, from Gao Feng. 12) Memory leak in rhashtable's alloc_bucket_locks(), from Eric Dumazet. 13) Add new device ID to alx driver, from Owen Lin. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (83 commits) Add Killer E2500 device ID in alx driver. net: smc91x: fix SMC accesses Documentation: networking: dsa: Remove platform device TODO net/mlx5: Increase number of ethtool steering priorities net/mlx5: Add error prints when validate ETS failed net/mlx5e: Fix memory leak if refreshing TIRs fails net/mlx5e: Add ethtool counter for TX xmit_more net/mlx5e: Fix ethtool -g/G rx ring parameter report with striding RQ net/mlx5e: Don't wait for SQ completions on close net/mlx5e: Don't post fragmented MPWQE when RQ is disabled net/mlx5e: Don't wait for RQ completions on close net/mlx5e: Limit UMR length to the device's limitation rhashtable: fix a memory leak in alloc_bucket_locks() sfc: fix potential stack corruption from running past stat bitmask team: loadbalance: push lacpdus to exact delivery net: hns: dereference ppe_cb->ppe_common_cb if it is non-null 8139cp: Fix one possible deadloop in cp_rx_poll i40e: Change some init flow for the client Revert "phy: IRQ cannot be shared" net: dsa: bcm_sf2: Fix race condition while unmasking interrupts ...

Documentation/networking/dsa/dsa.txt

+0 −20

Original line number	Diff line number	Diff line
		@@ -587,26 +587,6 @@ of DSA, would be the its port-based VLAN, used by the associated bridge device.
		TODO
		====

		The platform device problem
		---------------------------
		DSA is currently implemented as a platform device driver which is far from ideal
		as was discussed in this thread:

		http://permalink.gmane.org/gmane.linux.network/329848

		This basically prevents the device driver model to be properly used and applied,
		and support non-MDIO, non-MMIO Ethernet connected switches.

		Another problem with the platform device driver approach is that it prevents the
		use of a modular switch drivers build due to a circular dependency, illustrated
		here:

		http://comments.gmane.org/gmane.linux.network/345803

		Attempts of reworking this has been done here:

		https://lwn.net/Articles/643149/

		Making SWITCHDEV and DSA converge towards an unified codebase
		-------------------------------------------------------------

arch/arm/mach-pxa/idp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,8 @@ static struct resource smc91x_resources[] = {
		};

		static struct smc91x_platdata smc91x_platdata = {
		.flags = SMC91X_USE_32BIT \| SMC91X_USE_DMA \| SMC91X_NOWAIT,
		.flags = SMC91X_USE_8BIT \| SMC91X_USE_16BIT \| SMC91X_USE_32BIT \|
		SMC91X_USE_DMA \| SMC91X_NOWAIT,
		};

		static struct platform_device smc91x_device = {

arch/arm/mach-pxa/xcep.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,8 @@ static struct resource smc91x_resources[] = {
		};

		static struct smc91x_platdata xcep_smc91x_info = {
		.flags = SMC91X_USE_32BIT \| SMC91X_NOWAIT \| SMC91X_USE_DMA,
		.flags = SMC91X_USE_8BIT \| SMC91X_USE_16BIT \| SMC91X_USE_32BIT \|
		SMC91X_NOWAIT \| SMC91X_USE_DMA,
		};

		static struct platform_device smc91x_device = {

arch/arm/mach-realview/core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,8 @@ static struct smsc911x_platform_config smsc911x_config = {
		};

		static struct smc91x_platdata smc91x_platdata = {
		.flags = SMC91X_USE_32BIT \| SMC91X_NOWAIT,
		.flags = SMC91X_USE_8BIT \| SMC91X_USE_16BIT \| SMC91X_USE_32BIT \|
		SMC91X_NOWAIT,
		};

		static struct platform_device realview_eth_device = {

arch/arm/mach-sa1100/pleb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ static struct resource smc91x_resources[] = {
		};

		static struct smc91x_platdata smc91x_platdata = {
		.flags = SMC91X_USE_16BIT \| SMC91X_NOWAIT,
		.flags = SMC91X_USE_16BIT \| SMC91X_USE_8BIT \| SMC91X_NOWAIT,
		};

		static struct platform_device smc91x_device = {

Admin message