aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-10-06 20:44:30 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-07 16:39:50 -0400
commit91b9eb8261acfe473c369750036df24ad071e5c1 (patch)
tree0264350c12d7a2c4287fc610c23e202e595fc52c /drivers/net
parenta72d57a862f700edf85da81aae3cd8f923e989a1 (diff)
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')
-rw-r--r--drivers/net/wireless/ath/ath5k/pcu.c2
-rw-r--r--drivers/net/wireless/ath/ath5k/reset.c2
2 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 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)
295 * Set BSSID which triggers the "SME Join" operation 295 * Set BSSID which triggers the "SME Join" operation
296 */ 296 */
297 low_id = get_unaligned_le32(bssid); 297 low_id = get_unaligned_le32(bssid);
298 high_id = get_unaligned_le16(bssid); 298 high_id = get_unaligned_le16(bssid + 4);
299 ath5k_hw_reg_write(ah, low_id, AR_BSSMSKL); 299 ath5k_hw_reg_write(ah, low_id, AR_BSSMSKL);
300 ath5k_hw_reg_write(ah, high_id | ((assoc_id & 0x3fff) << 300 ath5k_hw_reg_write(ah, high_id | ((assoc_id & 0x3fff) <<
301 AR5K_BSS_ID1_AID_S), AR_BSSMSKU); 301 AR5K_BSS_ID1_AID_S), AR_BSSMSKU);
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 51aff7652c4b..39346a26ddb8 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -1178,7 +1178,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
1178 get_unaligned_le32(common->macaddr), 1178 get_unaligned_le32(common->macaddr),
1179 AR5K_STA_ID0); 1179 AR5K_STA_ID0);
1180 ath5k_hw_reg_write(ah, 1180 ath5k_hw_reg_write(ah,
1181 staid1_flags | get_unaligned_le16(common->macaddr), 1181 staid1_flags | get_unaligned_le16(common->macaddr + 4),
1182 AR5K_STA_ID1); 1182 AR5K_STA_ID1);
1183 1183
1184 1184