Lennert Buytenhek 62abd3cfb2 mwl8k: bump the transmit wait timeout to 5 seconds ... While it is reasonable to expect that at least one transmit ring entry will be processed per second while we are waiting for the transmit rings to drain, the firmware can end up doing batching of transmit ring status writeback, which means that the transmit rings can appear stuck for more than a second at a time. Bump the TX drain wait timeout up from 1 to 5 seconds to account for this. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2010-01-12 14:02:08 -05:00
..
accessibility
acpi	Merge branch 'thinkpad-2.6.32' into release	2009-11-25 00:43:08 -05:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2009-12-08 08:18:01 -08:00
atm	atm: [he] adjust tests to account for sk_wmem_alloc changes	2009-12-08 20:22:31 -08:00
auxdisplay
base	PM / Runtime: Remove unnecessary braces in __pm_runtime_set_status()	2009-12-06 16:17:57 +01:00
block	drbd_req.c: use part_[inc|dec]_in_flight()	2009-12-03 17:40:51 +01:00
bluetooth	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
cdrom
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6	2009-12-08 07:38:50 -08:00
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio	m68k: don't export static inline functions	2009-12-06 11:18:28 +01:00
dma	Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' into devel	2009-12-05 10:35:18 +00:00
edac	Merge branch 'perf/mce' into perf/core	2009-12-03 20:11:06 +01:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-12-08 08:13:10 -08:00
firmware
gpio	gpio: Langwell GPIO driver bugfixes	2009-12-01 16:32:19 -08:00
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-11-30 13:57:19 -08:00
hid
hwmon
i2c	i2c-stub: Allow user to disable some commands	2009-12-06 17:06:29 +01:00
ide	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2009-12-08 08:18:01 -08:00
idle
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-12-08 08:13:10 -08:00
ieee802154	ieee802154: merge cleanup	2009-12-02 01:13:11 -08:00
infiniband
input	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
isdn	gigaset: don't enable any debugging output by default	2009-12-08 20:30:41 -08:00
leds	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
lguest
macintosh
mca
md	Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6	2009-12-08 07:38:50 -08:00
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2009-12-08 07:47:46 -08:00
memstick
message
mfd	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
misc	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-12-08 08:12:16 -08:00
mmc	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
mtd	Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block	2009-12-08 08:19:16 -08:00
net	mwl8k: bump the transmit wait timeout to 5 seconds	2010-01-12 14:02:08 -05:00
nubus
of
oprofile
parisc
parport	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-12-08 08:13:35 -08:00
pci	Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-05 09:49:07 -08:00
pcmcia	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
platform	Merge branch 'misc-2.6.32' into release	2009-11-25 01:01:29 -05:00
pnp
power	collie: add battery driver	2009-11-27 21:07:23 +01:00
pps
ps3
rapidio
regulator	regulator: Initialise wm831x structure pointor for ISINK driver	2009-12-02 19:37:16 +00:00
rtc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-12-08 08:13:35 -08:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6	2009-12-08 07:38:50 -08:00
serial	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-12-08 08:12:43 -08:00
sfi
sh
sn
spi	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
ssb	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
staging	Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block	2009-12-08 08:19:16 -08:00
tc
telephony
thermal
uio
usb	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
uwb
video	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
virtio
vlynq
w1
watchdog	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
xen
zorro	m68k: don't export static inline functions	2009-12-06 11:18:28 +01:00
Kconfig
Makefile