Neil Horman aa25ab7d94 3c59x: Fix deadlock between boomerang_interrupt and boomerang_start_tx ... If netconsole is in use, there is a possibility for deadlock in 3c59x between boomerang_interrupt and boomerang_start_xmit. Both routines take the vp->lock, and if netconsole is in use, a pr_* call from the boomerang_interrupt routine will result in the netconsole code attempting to trnasmit an skb, which can try to take the same spin lock, resulting in deadlock. The fix is pretty straightforward. This patch allocats a bit in the 3c59x private structure to indicate that its handling an interrupt. If we get into the transmit routine and that bit is set, we can be sure that we have recursed and will deadlock if we continue, so instead we just return NETDEV_TX_BUSY, so the stack requeues the skb to try again later. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2010-08-24 01:47:40 -07:00
..
accessibility
acpi	acpi ec_sys: Be more cautious about ec write access	2010-08-03 09:49:13 -04:00
amba	ARM: AMBA: Add pclk support to AMBA bus infrastructure	2010-07-31 13:07:27 +01:00
ata
atm	solos-pci: Fix race condition in tasklet RX handling	2010-08-07 23:02:59 -07:00
auxdisplay
base	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-08-04 11:47:58 -07:00
block	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
bluetooth
cdrom
char	ppp: make channel_ops const	2010-08-04 21:53:17 -07:00
clocksource
connector
cpufreq	[CPUFREQ] fix brace coding style issue.	2010-08-03 13:47:05 -04:00
cpuidle	[CPUFREQ] x86 cpufreq: Make trace_power_frequency cpufreq driver independent	2010-08-03 13:47:05 -04:00
crypto	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
dca
dio
dma	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
edac	amd64_edac: Minor formatting fix	2010-08-04 11:16:01 +02:00
eisa
firewire
firmware	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6	2010-08-04 11:25:58 -07:00
gpio	Merge branch 'misc' into devel	2010-07-31 14:20:02 +01:00
gpu	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2010-08-04 15:23:49 -07:00
hwmon
i2c
ide
idle	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2010-08-04 11:13:36 -07:00
ieee1394
ieee802154
infiniband	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
input	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
isdn	isdn/avm: fix build when PCMCIA is not enabled	2010-08-22 21:37:33 -07:00
leds
lguest
macintosh
mca
md
media	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
memstick
message	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
mfd
misc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-08-04 15:15:15 -07:00
mmc	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-08-03 14:31:24 -07:00
mtd	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
net	3c59x: Fix deadlock between boomerang_interrupt and boomerang_start_tx	2010-08-24 01:47:40 -07:00
nubus
of
oprofile
parisc	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
parport
pci
pcmcia	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
platform	ips driver: make it less chatty	2010-08-03 11:55:15 -04:00
pnp
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
s390	ctcm: rename READ/WRITE defines to avoid redefinitions	2010-08-12 16:04:23 -07:00
sbus
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
serial	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
sfi
sh
sn
spi
ssb
staging	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
tc
telephony
thermal
uio
usb	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
uwb
vhost	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-08-04 11:47:58 -07:00
video	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
virtio
vlynq
w1
watchdog
xen
zorro
Kconfig
Makefile