Emmanuel Grumbach 1ba42da479 iwlwifi: we can wake SW queues even when draining HW queues ... In the very first implementation of HT, the driver was responsible for the queueing: stopping and waking the queues while the HW queues where being drained. In this implementation, we had to deal with the case where we were draining the AGG queue because we wanted to tear down the BA agreement. In the normal flow (when we don't drain any HW queue), when packets are reclaimed, we wake the SW queue in case the SW queue was stopped which can happen when the HW queues are too full. While draining a HW queue, we must make sure that we don't wake the SW queue, since the whole point of the draining is to empty totally the HW queue and not only get below a certain threshold. This is why there is condition in the reclaim function: if (NOT EMPTYING DELBA) wake the SW queue is applicable Since then, a lot has changed and mac80211 is now able to buffer packets that are being sent to a packet list that will be spliced after the driver has reported it has drained its HW queues. Hence, there is no need for the for aforementioned if, and we can safely wake up the queue even if we are draining HW queues. Removing this if, also allows us to remove the wake_queue in check_empty that was there in order to deal with a corner case created by the if. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>		2011-12-16 07:22:38 -08:00
..
accessibility
acpi	ACPI / cpuidle: Remove acpi_idle_suspend (to fix suspend regression)	2011-11-12 21:30:14 -02:00
amba
ata	pata_of_platform: Don't use NO_IRQ	2011-11-10 15:57:59 -05:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2011-10-25 13:25:22 +02:00
auxdisplay
base	PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())	2011-11-08 22:34:00 +01:00
bcma	bcma: extract revision and TX power IDs from SPROM	2011-12-13 15:47:41 -05:00
block	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2011-12-06 16:02:05 -05:00
cdrom
char	agp: iommu_gfx_mapped only available if CONFIG_INTEL_IOMMU is set	2011-11-08 10:50:27 +00:00
clk
clocksource	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
connector
cpufreq	[CPUFREQ] db8500: fix build error due to undeclared i variable	2011-11-11 22:28:33 -05:00
cpuidle	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2011-11-07 10:13:52 -08:00
crypto	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
dca	drivers/dca: Add export.h for THIS_MODULE to dca-sysfs.c	2011-10-31 19:31:43 -04:00
devfreq
dio
dma	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
edac	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
eisa
firewire	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
firmware	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
gpio	Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6	2011-11-15 14:45:50 -02:00
gpu	Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux	2011-11-13 17:09:55 -02:00
hid	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
hv	hv: remove struct hv_device_info from hyperv.h	2011-10-11 09:51:22 -06:00
hwmon	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
hwspinlock	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-08 18:34:16 -08:00
i2c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
ide	ide-{cd,floppy,tape}: Do not include <linux/irq.h>	2011-11-08 22:35:46 +01:00
idle	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2011-11-07 10:13:52 -08:00
ieee802154
infiniband	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
input	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
iommu	iommu: omap: Fix compile failure	2011-11-08 17:11:57 +01:00
isdn	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
leds	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
lguest	lguest: add export.h to lguest files for THIS_MODULE/EXPORT_SYMBOL	2011-10-31 19:32:13 -04:00
macintosh	m68k/irq: Remove obsolete IRQ_FLG_* users	2011-11-08 22:35:48 +01:00
mca
md	md/raid5: STRIPE_ACTIVE has lock semantics, add barriers	2011-11-08 16:22:06 +11:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2011-11-12 00:03:50 -02:00
memstick	drivers/memstick: Add module.h to the prev. implicit modular users	2011-10-31 19:31:52 -04:00
message	drivers/message: Add module.h to i2o/pci.c	2011-10-31 19:31:53 -04:00
mfd	mfd: fix build failures in recently added ab5500 code	2011-11-07 21:45:14 -05:00
misc	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
mmc	arm/imx: fix imx6q mmc error when mounting rootfs	2011-11-11 16:53:35 +01:00
mtd	MTD: MAPS: bcm963xx-flash.c: explicitly include module.h	2011-11-07 21:26:55 -05:00
net	iwlwifi: we can wake SW queues even when draining HW queues	2011-12-16 07:22:38 -08:00
nfc	NFC: DEP link hook implementation for pn533	2011-12-14 14:50:13 -05:00
nubus
of	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
oprofile
parisc	parisc: add module.h to files really requiring it	2011-10-31 19:31:01 -04:00
parport	parport_pc: release IO region properly if unsupported ITE887x card is found	2011-10-18 14:17:40 -07:00
pci	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pcmcia	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pinctrl	pinctrl: hide subsystem from the populace	2011-11-10 09:02:12 +01:00
platform	x86 platform drivers: add POWER_SUPPLY to selected drivers for Dell	2011-11-08 12:49:29 -08:00
pnp	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2011-11-07 10:13:52 -08:00
power	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pps	pps gpio client: add missing dependency	2011-11-02 16:07:02 -07:00
ps3	powerpc/ps3: irq: Remove IRQF_DISABLED	2011-11-08 14:51:46 +11:00
ptp
rapidio	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
regulator	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
rtc	vrtc: change its year offset from 1960 to 1972	2011-11-11 23:58:58 -02:00
s390	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
sbus
scsi	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
sfi	drivers/sfi: sfi_acpi.c needs sysfs.h	2011-10-31 19:31:57 -04:00
sh	Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus	2011-11-11 16:16:25 +09:00
sn
spi	atmel/spi: fix missing probe	2011-11-09 23:02:12 +08:00
ssb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2011-12-14 14:35:41 -05:00
staging	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
target	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
tc
telephony
thermal	thermal: Prevent polling from happening during system suspend	2011-11-06 20:38:49 -05:00
tty	Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus	2011-11-11 16:16:25 +09:00
uio	uio: Add module.h to implicit drivers/uio users	2011-10-31 19:32:10 -04:00
usb	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
uwb	uwb: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required	2011-10-31 19:32:19 -04:00
vhost
video	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
virt	drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager	2011-10-14 02:56:02 -05:00
virtio	virtio-pci: fix use after free	2011-11-14 11:16:26 +10:30
vlynq
w1	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
watchdog	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
xen	Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-11-06 20:13:34 -08:00
zorro	drivers/zorro: Add export.h to proc.c	2011-10-31 19:32:01 -04:00
Kconfig	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2011-10-26 15:39:02 +02:00
Makefile	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2011-10-26 15:39:02 +02:00