aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-10-06 20:44:33 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-07 16:39:50 -0400
commita3f86bff1c056f47c2df4c58bfcf7bdda8eaf9d0 (patch)
treecaf1d492b4f0ff5cc3342909b4f85f4e38a90b4b
parentabba06869e2546484fa142528737d1a0622add54 (diff)
ath5k: fix regression which triggers an SME join upon assoc
This fixes a regression introduced by patch titled: "atheros: define shared bssidmask setting" The register for the BSSID was exchanged for the bssid mask register. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath5k/pcu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index 2ab9c0ecbb8..64fc1eb9b6d 100644
--- a/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/drivers/net/wireless/ath/ath5k/pcu.c
@@ -295,11 +295,11 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah)
*/
ath5k_hw_reg_write(ah,
get_unaligned_le32(common->curbssid),
- AR_BSSMSKL);
+ AR5K_BSS_ID0);
ath5k_hw_reg_write(ah,
get_unaligned_le16(common->curbssid + 4) |
((common->curaid & 0x3fff) << AR5K_BSS_ID1_AID_S),
- AR_BSSMSKU);
+ AR5K_BSS_ID1);
if (common->curaid == 0) {
ath5k_hw_disable_pspoll(ah);