Lennert Buytenhek 92c70f27d2 mv643xx_eth: fix double add_timer() on the receive oom timer ... Commit 12e4ab79cd ("mv643xx_eth: be more agressive about RX refill") changed the condition for the receive out-of-memory timer to be scheduled from "the receive ring is empty" to "the receive ring is not full". This can lead to a situation where the receive out-of-memory timer is pending because a previous rxq_refill() didn't manage to refill the receive ring entirely as a result of being out of memory, and rxq_refill() is then called again as a side effect of a packet receive interrupt, and that rxq_refill() call then again does not succeed to refill the entire receive ring with fresh empty skbuffs because we are still out of memory, and then tries to call add_timer() on the already scheduled out-of-memory timer. This patch fixes this issue by changing the add_timer() call in rxq_refill() to a mod_timer() call. If the OOM timer was not already scheduled, this will behave as before, whereas if it was already scheduled, this patch will push back its firing time a bit, which is safe because we've (unsuccessfully) attempted to refill the receive ring just before we do this. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>		2008-08-24 03:33:02 +02:00
..
accessibility	…
acpi	Merge branches 'acpica-release-fixes', 'ec-fix', 'dock', 'irq-bounds', 'thermal-fix', 'wmi' and 'acpi-cleanups' into release-2.6.27	2008-08-15 03:30:00 +02:00
amba	…
ata	avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>	2008-08-05 14:36:57 +02:00
atm	atm: fix direct casts of pointers to u32 in the InterPhase driver	2008-07-30 16:33:05 -07:00
auxdisplay	…
base	Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-08-01 11:52:39 -07:00
block	brd: fix name argument of unregister_blkdev()	2008-08-20 15:40:30 -07:00
bluetooth	[Bluetooth] Consolidate maintainers information	2008-08-18 13:23:53 +02:00
cdrom	cdrom: handle TOC	2008-08-18 21:40:04 +02:00
char	drivers/char/ipmi/ipmi_si_intf.c:default_find_bmc(): fix leak	2008-08-20 15:40:31 -07:00
clocksource	…
connector	…
cpufreq	[CPUFREQ] Fix -Wshadow warning in conservative governor.	2008-08-08 16:00:48 -04:00
cpuidle	cpuidle: Make ladder governor honor latency requirements fully	2008-08-15 21:25:35 +02:00
crypto	crypto: padlock - fix VIA PadLock instruction usage with irq_ts_save/restore()	2008-08-13 22:02:26 +10:00
dca	…
dio	…
dma	Merge branch 'for-rmk' of git://git.marvell.com/orion	2008-08-09 18:03:13 +01:00
edac	…
eisa	…
firewire	firewire: Kconfig help update	2008-08-19 18:47:56 +02:00
firmware	firmware/memmap: cleanup	2008-08-12 16:07:31 -07:00
gpio	…
gpu	Remove newline from the description of module parameters	2008-08-01 12:46:41 -07:00
hid	Input: bcm5974 - add driver for Macbook Air and Pro Penryn touchpads	2008-08-08 16:23:01 -04:00
hwmon	hwmon-vid: Fix AMD K8 VID decoding	2008-08-15 11:50:15 -07:00
i2c	USB: isp1301: fix compilation	2008-08-13 17:32:56 -07:00
ide	sgiioc4: fixup message on resource allocation failure	2008-08-18 21:40:04 +02:00
ieee1394	ieee1394: sbp2: let nodemgr retry node updates during bus reset series	2008-08-19 18:47:56 +02:00
infiniband	Merge branches 'ehca' and 'ipoib' into for-linus	2008-08-12 13:52:54 -07:00
input	Merge branch 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2008-08-20 08:46:11 -07:00
isdn	Add DIP switch readout for HFC-4S IOB4ST	2008-08-02 16:40:37 +02:00
leds	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
lguest	lguest: use get_user_pages_fast() instead of get_user_pages()	2008-08-12 17:52:53 +10:00
macintosh	remove unnecessary <linux/hdreg.h> includes	2008-08-05 18:16:58 +02:00
mca	…
md	md: cancel check/repair requests when recovery is needed	2008-08-07 10:02:47 -07:00
media	Merge Linus' latest into master	2008-08-08 19:18:18 +01:00
memstick	…
message	…
mfd	mfd: tc6393 cleanup and update	2008-08-10 23:32:07 +02:00
misc	eeepc-laptop: fix use after free	2008-08-20 15:40:30 -07:00
mmc	sdricoh_cs: removed unused #include <version.h>	2008-08-17 20:01:35 +02:00
mtd	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2008-08-16 16:48:45 -07:00
net	mv643xx_eth: fix double add_timer() on the receive oom timer	2008-08-24 03:33:02 +02:00
nubus	…
of	powerpc/ibmebus: Restore "name" sysfs attribute on ibmebus devices	2008-08-20 09:50:21 +10:00
oprofile	…
parisc	…
parport	…
pci	Merge branch 'x86-merge' into for-linus	2008-08-18 17:23:24 -07:00
pcmcia	[ARM] 5198/1: PalmTX: PCMCIA fixes	2008-08-16 16:35:33 +01:00
pnp	PNP: fix formatting of dbg_pnp_show_resources() output	2008-08-01 12:46:41 -07:00
power	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
ps3	…
rapidio	…
regulator	regulator: TI bq24022 Li-Ion Charger driver	2008-07-30 10:10:23 +01:00
rtc	rtc: rtc-ds1374: fix 'no irq' case handling	2008-08-20 15:40:32 -07:00
s390	[S390] qeth: avoid use of include/asm-s390	2008-08-01 16:39:36 +02:00
sbus	sparc/drivers: use linux/of_device.h instead of asm/of_device.h	2008-08-11 14:30:53 -07:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6	2008-08-20 08:42:53 -07:00
serial	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2008-08-16 16:48:45 -07:00
sh	sh: Fix up broken kerneldoc comments.	2008-08-04 12:51:06 +09:00
sn	…
spi	spi: bugfix spi_add_device() with duplicate chipselects	2008-08-15 08:35:44 -07:00
ssb	ssb: allow compilation on systems without PCI	2008-08-18 11:05:13 -04:00
tc	…
telephony	…
thermal	…
uio	…
usb	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2008-08-16 16:48:45 -07:00
video	fbdefio: add set_page_dirty handler to deferred IO FB	2008-08-20 15:40:32 -07:00
virtio	…
w1	…
watchdog	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2008-08-16 16:48:45 -07:00
xen	…
zorro	…
Kconfig	…
Makefile	USB: Add MUSB and TUSB support	2008-08-13 17:33:00 -07:00