Bob Copeland 6b5dcccb49 ath5k: retain promiscuous setting ... Commit 56d1de0a21, "ath5k: clean up filter flags setting" introduced a regression in monitor mode such that the promisc filter flag would get lost. Although we set the promisc flag when it changed, we did not preserve it across subsequent calls to configure_filter. This patch restores the original functionality. Cc: stable@kernel.org Bisected-by: weedy2887@gmail.com Tested-by: weedy2887@gmail.com Tested-by: Rick Farina <sidhayn@gmail.com> Signed-off-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2010-06-04 15:50:52 -04:00
..
accessibility
acpi	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-05-20 09:45:38 -07:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2010-05-20 09:27:37 -07:00
atm	atm: select FW_LOADER in Kconfig for solos-pci	2010-05-17 17:44:36 -07:00
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6	2010-05-20 09:03:55 -07:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
cdrom
char	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-05-20 10:33:06 -07:00
clocksource	Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-19 17:10:57 -07:00
connector
cpufreq	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-18 08:49:13 -07:00
cpuidle	PM QOS update	2010-05-10 23:08:19 +02:00
crypto
dca
dio
dma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-05-19 11:36:03 -07:00
edac
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
firmware
gpio	Merge branch 'topic/asoc' into for-linus	2010-05-20 12:00:43 +02:00
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
hid	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-05-11 17:38:04 -07:00
i2c	Merge branch 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux	2010-05-20 09:41:17 -07:00
ide	pcmcia: dev_node removal (drivers with updated printk call)	2010-05-10 10:23:15 +02:00
idle
ieee1394
ieee802154
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
input	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
leds
lguest
macintosh
mca
md	md: restore ability of spare drives to spin down.	2010-05-07 21:10:57 +10:00
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
memstick
message
mfd	Merge branch 'topic/asoc' into for-linus	2010-05-20 12:00:43 +02:00
misc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
mmc	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-05-19 11:37:22 -07:00
mtd	pcmcia: dev_node removal (write-only drivers)	2010-05-10 10:23:14 +02:00
net	ath5k: retain promiscuous setting	2010-06-04 15:50:52 -04:00
nubus
of
oprofile
parisc
parport	pcmcia: dev_node removal (write-only drivers)	2010-05-10 10:23:14 +02:00
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-05-20 09:09:46 -07:00
platform
pnp	Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', 'bugzilla-15903' and 'misc-2.6.34' into release	2010-05-06 22:04:31 -04:00
power
pps
ps3
rapidio
regulator	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
rtc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-05-20 09:09:46 -07:00
sfi
sh	sh: simplify WARN usage in SH clock driver	2010-05-13 17:43:11 +09:00
sn
spi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
ssb	ssb: fix NULL ptr deref when pcihost_wrapper is used	2010-05-28 13:57:01 -04:00
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
tc
telephony	pcmcia: dev_node removal (write-only drivers)	2010-05-10 10:23:14 +02:00
thermal
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
uwb
vhost	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-16 22:26:58 -07:00
video	Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6	2010-05-20 13:34:17 -07:00
virtio
vlynq	vlynq: make whole Kconfig-menu dependant on architecture	2010-05-14 16:59:54 +02:00
w1
watchdog	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00
xen	stop_machine: reimplement using cpu_stop	2010-05-06 18:49:20 +02:00
zorro	m68k: amiga - Zorro host bridge platform device conversion	2010-05-17 21:37:42 +02:00
Kconfig
Makefile	virtio: initialize earlier	2010-05-07 14:01:17 -07:00