Jason Wang f663dd9aaf net: core: explicitly select a txq before doing l2 forwarding ... Currently, the tx queue were selected implicitly in ndo_dfwd_start_xmit(). The will cause several issues: - NETIF_F_LLTX were removed for macvlan, so txq lock were done for macvlan instead of lower device which misses the necessary txq synchronization for lower device such as txq stopping or frozen required by dev watchdog or control path. - dev_hard_start_xmit() was called with NULL txq which bypasses the net device watchdog. - dev_hard_start_xmit() does not check txq everywhere which will lead a crash when tso is disabled for lower device. Fix this by explicitly introducing a new param for .ndo_select_queue() for just selecting queues in the case of l2 forwarding offload. netdev_pick_tx() was also extended to accept this parameter and dev_queue_xmit_accel() was used to do l2 forwarding transmission. With this fixes, NETIF_F_LLTX could be preserved for macvlan and there's no need to check txq against NULL in dev_hard_start_xmit(). Also there's no need to keep a dedicated ndo_dfwd_start_xmit() and we can just reuse the code of dev_queue_xmit() to do the transmission. In the future, it was also required for macvtap l2 forwarding support since it provides a necessary synchronization method. Cc: John Fastabend <john.r.fastabend@intel.com> Cc: Neil Horman <nhorman@tuxdriver.com> Cc: e1000-devel@lists.sourceforge.net Signed-off-by: Jason Wang <jasowang@redhat.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Acked-by: John Fastabend <john.r.fastabend@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-10 13:23:08 -05:00
..
accessibility
acpi	Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'	2013-12-31 22:03:37 +01:00
amba
ata	Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	2013-12-24 09:35:58 -08:00
atm	atm: idt77252: fix dev refcnt leak	2013-11-19 15:53:02 -05:00
auxdisplay
base	Revert "cpufreq: suspend governors on system suspend/hibernate"	2013-12-08 01:04:17 +01:00
bcma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-11-13 17:40:34 +09:00
block	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2013-12-24 10:06:03 -08:00
bluetooth	Bluetooth: Add support for Toshiba Bluetooth device [0930:0220]	2013-12-04 11:11:49 -02:00
bus	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 08:51:29 +09:00
cdrom
char	Char/Misc driver fixes for 3.13-rc3	2013-12-08 18:47:25 -08:00
clk	mfd: s2mps11: Fix build after regmap field rename in sec-core.c	2013-12-16 11:30:39 +00:00
clocksource	clocksource: dw_apb_timer_of: Fix support for dts binding "snps,dw-apb-timer"	2013-12-10 19:49:18 +01:00
connector	connector: improved unaligned access error fix	2013-11-14 17:19:20 -05:00
cpufreq	intel_pstate: Fail initialization if P-state information is missing	2013-12-31 13:37:46 +01:00
cpuidle	ARM/cpuidle: remove __init tag from Calxeda cpuidle probe function	2013-12-30 11:55:20 +01:00
crypto	crypto: ixp4xx - Fix kernel compile error	2014-01-01 14:06:23 +08:00
dca
devfreq
dio
dma	drivers/dma/ioat/dma.c: check DMA mapping error in ioat_dma_self_test()	2014-01-02 14:40:30 -08:00
edac	sb_edac: Shut up compiler warning when EDAC_DEBUG is enabled	2013-11-30 12:26:36 +01:00
eisa
extcon	extcon: remove freed groups caused the panic or warning in unregister flow	2013-11-26 15:17:23 +09:00
firewire	firewire: sbp2: bring back WRITE SAME support	2013-12-15 16:32:32 +01:00
firmware	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-12-29 13:35:04 -08:00
fmc
gpio	GPIO fixes for the v3.13 development cycle:	2013-12-17 11:47:40 -08:00
gpu	ACPI and power management fixes and new device IDs for 3.13-rc7	2014-01-03 13:44:41 -08:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2013-12-13 13:21:28 -08:00
hsi
hv
hwmon	hwmon fixes for 3.13-rc4	2013-12-12 11:05:19 -08:00
hwspinlock
i2c	i2c: imx: Check the return value from clk_prepare_enable()	2013-12-12 22:48:22 +01:00
ide	More ACPI and power management updates for 3.13-rc1	2013-11-20 13:25:04 -08:00
idle	x86 idle: Repair large-server 50-watt idle-power regression	2013-12-19 11:47:39 -08:00
iio	iio:adc:ad7887 Fix channel reported endianness from cpu to big endian	2013-12-17 20:37:14 +00:00
infiniband	infiniband: make sure the src net is infiniband when create new link	2014-01-03 20:38:56 -05:00
input	Input: allocate absinfo data when setting ABS capability	2013-12-31 10:53:19 -08:00
iommu	iommu/arm-smmu: fix error return code in arm_smmu_device_dt_probe()	2013-12-06 16:44:25 +00:00
ipack
irqchip	Renesas ARM based SoC fixes for v3.13	2013-12-20 11:28:30 -08:00
isdn	isdn: Drop big endian cpp checks from telespci and hfc_pci drivers	2014-01-06 15:50:51 -05:00
leds	leds: pwm: Fix for deferred probe in DT booted mode	2013-12-02 11:53:17 -08:00
lguest
macintosh	powerpc/windfarm: Fix XServe G5 fan control Makefile issue	2013-11-27 11:35:47 +11:00
mailbox
md	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2013-12-24 10:06:03 -08:00
media	[media] videobuf2-dma-sg: fix possible memory leak	2013-12-10 05:40:57 -02:00
memory
memstick	tree-wide: use reinit_completion instead of INIT_COMPLETION	2013-11-15 09:32:21 +09:00
message	drivers/message/i2o/driver.c: add missing destroy_workqueue() on error in i2o_driver_register()	2013-11-13 12:09:26 +09:00
mfd	mfd/rtc: s5m: fix register updating by adding regmap for RTC	2013-12-12 18:19:26 -08:00
misc	Char/Misc driver fixes for 3.13-rc3	2013-12-08 18:47:25 -08:00
mmc	mmc: omap: Fix I2C dependency and make driver usable with device tree	2013-11-26 15:51:16 -08:00
mtd	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2014-01-06 12:20:45 +11:00
net	net: core: explicitly select a txq before doing l2 forwarding	2014-01-10 13:23:08 -05:00
nfc
ntb	NTB driver bug fixes to address a missed call to pci_enable_msix,	2013-11-26 11:15:12 -08:00
nubus
of	Merge remote-tracking branch 'grant/devicetree/merge' into dt-fixes	2013-12-30 12:09:47 -06:00
oprofile
parisc
parport	Kconfig cleanups for v3.13	2013-11-15 14:05:15 -08:00
pci	Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'	2013-12-31 22:03:37 +01:00
pcmcia	DeviceTree updates for 3.13. This is a bit larger pull request than	2013-11-12 16:52:17 +09:00
phy	phy: kconfig: add depends on "USB_PHY" to OMAP_USB2 and TWL4030_USB	2013-12-10 12:53:30 -08:00
pinctrl	Merge branches 'powercap' and 'acpi-lpss' with new device IDs	2013-12-27 00:43:24 +01:00
platform	sony-laptop: do not scribble keyboard backlight registers on resume	2013-11-26 13:03:36 +09:00
pnp	PNP: fix restoring devices after hibernation	2013-12-05 02:01:55 +01:00
power	max17042_battery: Fix build errors caused by missing REGMAP_I2C config	2013-12-01 14:25:03 -08:00
powercap	powercap / RAPL: add support for ValleyView Soc	2013-12-22 01:27:51 +01:00
pps	drivers/pps/clients/pps-gpio.c: remove redundant of_match_ptr	2013-11-13 12:09:35 +09:00
ps3
ptp
pwm
rapidio
regulator	mfd: s2mps11: Fix build after regmap field rename in sec-core.c	2013-12-16 11:30:39 +00:00
remoteproc
reset
rpmsg
rtc	mfd/rtc: s5m: fix register updating by adding regmap for RTC	2013-12-12 18:19:26 -08:00
s390	s390/3270: fix allocation of tty3270_screen structure	2013-12-18 17:35:30 +01:00
sbus
scsi	qla2xxx: Fix scsi_host leak on qlt_lport_register callback failure	2013-12-19 14:50:17 -08:00
sfi
sh
sn
spi	Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx', 'spi/fix/mpc512x-psc', 'spi/fix/mxs', 'spi/fix/pxa2xx', 'spi/fix/qspi', 'spi/fix/rspi' and 'spi/fix/txx9' into spi-linus	2013-11-28 11:31:35 +00:00
ssb
staging	net: core: explicitly select a txq before doing l2 forwarding	2014-01-10 13:23:08 -05:00
target	target: Remove extra percpu_ref_init	2013-12-19 14:49:54 -08:00
tc
thermal	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-19 15:50:47 -08:00
tty	tty: xuartps: Properly guard sysrq specific code	2013-12-17 16:02:25 -08:00
uio	uio: we cannot mmap unaligned page contents	2013-12-02 11:50:37 -08:00
usb	usb: ohci-at91: fix irq and iomem resource retrieval	2013-12-17 13:22:36 -08:00
uwb
vfio
vhost	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-11-22 10:52:03 -08:00
video	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-12-09 19:21:39 -08:00
virt
virtio	virtio_balloon: update_balloon_size(): update correct field	2013-12-05 13:12:39 +10:30
vlynq
vme
w1	drivers/w1/masters/w1-gpio.c: use dev_get_platdata()	2013-11-15 09:32:21 +09:00
watchdog	sc1200_wdt: Fix oops	2013-12-10 08:48:15 +01:00
xen	Bug-fixes:	2013-12-20 09:34:54 -08:00
zorro
Kconfig	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
Makefile	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00