From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Wed, 7 Oct 2009 00:44:33 +0000 (-0400)
Subject: ath5k: fix regression which triggers an SME join upon assoc
X-Git-Tag: MMI-PSA29.97-13-9~25754^2~865^2~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a3f86bff1c056f47c2df4c58bfcf7bdda8eaf9d0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index 2ab9c0ecbb8b..64fc1eb9b6d9 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);