Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 03:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ath5k: fix regression introduced upon the removal of AR5K_HIGH_ID()

Browse Source 
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>
This commit is contained in:
Luis R. Rodriguez 2009-10-06 20:44:30 -04:00 committed by John W. Linville
parent a72d57a862
commit 91b9eb8261
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath5k/pcu.c
View File

@ -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);

2
drivers/net/wireless/ath/ath5k/reset.c
View File

@ -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);