aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath5k/reset.c
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/wireless/ath/ath5k/reset.c
parenta72d57a862f700edf85da81aae3cd8f923e989a1 (diff)
downloadkernel_samsung_smdk4412-91b9eb8261acfe473c369750036df24ad071e5c1.zip
kernel_samsung_smdk4412-91b9eb8261acfe473c369750036df24ad071e5c1.tar.gz
kernel_samsung_smdk4412-91b9eb8261acfe473c369750036df24ad071e5c1.tar.bz2
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/reset.c')
-rw-r--r--drivers/net/wireless/ath/ath5k/reset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 51aff76..39346a2 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,
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);