summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ath/ath5k/pcu.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-10-07 04:44:30 +0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-08 00:39:50 +0400
commit91b9eb8261acfe473c369750036df24ad071e5c1 (patch)
tree0264350c12d7a2c4287fc610c23e202e595fc52c /drivers/net/wireless/ath/ath5k/pcu.c
parenta72d57a862f700edf85da81aae3cd8f923e989a1 (diff)
downloadlinux-91b9eb8261acfe473c369750036df24ad071e5c1.tar.xz
ath5k: fix regression introduced upon the removal of AR5K_HIGH_ID()
The trick was to add four bytes whenever this was used. There are two places where this was missed. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/pcu.c')
-rw-r--r--drivers/net/wireless/ath/ath5k/pcu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index 32fd5f88fb73..9e6e41bdd099 100644
--- a/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/drivers/net/wireless/ath/ath5k/pcu.c
@@ -295,7 +295,7 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah, const u8 *bssid, u16 assoc_id)
* Set BSSID which triggers the "SME Join" operation
*/
low_id = get_unaligned_le32(bssid);
- high_id = get_unaligned_le16(bssid);
+ high_id = get_unaligned_le16(bssid + 4);
ath5k_hw_reg_write(ah, low_id, AR_BSSMSKL);
ath5k_hw_reg_write(ah, high_id | ((assoc_id & 0x3fff) <<
AR5K_BSS_ID1_AID_S), AR_BSSMSKU);