Commit a3f86bff authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville

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: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent abba0686
...@@ -295,11 +295,11 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah) ...@@ -295,11 +295,11 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah)
*/ */
ath5k_hw_reg_write(ah, ath5k_hw_reg_write(ah,
get_unaligned_le32(common->curbssid), get_unaligned_le32(common->curbssid),
AR_BSSMSKL); AR5K_BSS_ID0);
ath5k_hw_reg_write(ah, ath5k_hw_reg_write(ah,
get_unaligned_le16(common->curbssid + 4) | get_unaligned_le16(common->curbssid + 4) |
((common->curaid & 0x3fff) << AR5K_BSS_ID1_AID_S), ((common->curaid & 0x3fff) << AR5K_BSS_ID1_AID_S),
AR_BSSMSKU); AR5K_BSS_ID1);
if (common->curaid == 0) { if (common->curaid == 0) {
ath5k_hw_disable_pspoll(ah); ath5k_hw_disable_pspoll(ah);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment