summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby2008-07-23 13:17:34 +0200
committerJohn W. Linville2008-08-01 21:31:33 +0200
commitdc1968e7b7862bcd2d358c1be6119c011992bdd2 (patch)
treebd61fddcda41e96a4a8b4b624a68385677569be4
parentRFKILL: set the status of the leds on activation. (diff)
downloadkernel-qcow2-linux-dc1968e7b7862bcd2d358c1be6119c011992bdd2.tar.gz
kernel-qcow2-linux-dc1968e7b7862bcd2d358c1be6119c011992bdd2.tar.xz
kernel-qcow2-linux-dc1968e7b7862bcd2d358c1be6119c011992bdd2.zip
Ath5k: mask out unneeded interrupts
Mask out previously demanded interrupt flags because we set new ones. Don't allow mixing them after switch from sta to ibss and vice versa. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Nick Kossifidis <mickflemm@gmail.com> Cc: Luis R. Rodriguez <mcgrof@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath5k/base.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index ff3fad794b61..ebf19bc11f5b 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -2170,6 +2170,7 @@ ath5k_beacon_config(struct ath5k_softc *sc)
ath5k_hw_set_intr(ah, 0);
sc->bmisscount = 0;
+ sc->imask &= ~(AR5K_INT_BMISS | AR5K_INT_SWBA);
if (sc->opmode == IEEE80211_IF_TYPE_STA) {
sc->imask |= AR5K_INT_BMISS;