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>

diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index 32fd5f88fb7307f6b62bb59eaa4dc67bdde3cac4..9e6e41bdd0998c3d8720a2fc9806a8f31fc82654 100644 (file)
--- 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);

diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 51aff7652c4bc75250bb5e58d9956b786b8305a3..39346a26ddb81e213664ea0a479aa862bd5959c3 100644 (file)
--- 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,
                           get_unaligned_le32(common->macaddr),
                           AR5K_STA_ID0);
        ath5k_hw_reg_write(ah,
-                          staid1_flags | get_unaligned_le16(common->macaddr),
+                          staid1_flags | get_unaligned_le16(common->macaddr + 4),
                           AR5K_STA_ID1);