Commit abba0686 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville

ath5k: remove temporary low_id and high_id vars on ath5k_hw_set_associd()

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent be5d6b75
...@@ -282,7 +282,6 @@ int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac) ...@@ -282,7 +282,6 @@ int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)
void ath5k_hw_set_associd(struct ath5k_hw *ah) void ath5k_hw_set_associd(struct ath5k_hw *ah)
{ {
struct ath_common *common = ath5k_hw_common(ah); struct ath_common *common = ath5k_hw_common(ah);
u32 low_id, high_id;
u16 tim_offset = 0; u16 tim_offset = 0;
/* /*
...@@ -294,11 +293,13 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah) ...@@ -294,11 +293,13 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah)
/* /*
* Set BSSID which triggers the "SME Join" operation * Set BSSID which triggers the "SME Join" operation
*/ */
low_id = get_unaligned_le32(common->curbssid); ath5k_hw_reg_write(ah,
high_id = get_unaligned_le16(common->curbssid + 4); get_unaligned_le32(common->curbssid),
ath5k_hw_reg_write(ah, low_id, AR_BSSMSKL); AR_BSSMSKL);
ath5k_hw_reg_write(ah, high_id | ((common->curaid & 0x3fff) << ath5k_hw_reg_write(ah,
AR5K_BSS_ID1_AID_S), AR_BSSMSKU); get_unaligned_le16(common->curbssid + 4) |
((common->curaid & 0x3fff) << AR5K_BSS_ID1_AID_S),
AR_BSSMSKU);
if (common->curaid == 0) { if (common->curaid == 0) {
ath5k_hw_disable_pspoll(ah); ath5k_hw_disable_pspoll(ah);
...@@ -306,7 +307,7 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah) ...@@ -306,7 +307,7 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah)
} }
AR5K_REG_WRITE_BITS(ah, AR5K_BEACON, AR5K_BEACON_TIM, AR5K_REG_WRITE_BITS(ah, AR5K_BEACON, AR5K_BEACON_TIM,
tim_offset ? tim_offset + 4 : 0); tim_offset ? tim_offset + 4 : 0);
ath5k_hw_enable_pspoll(ah, NULL, 0); ath5k_hw_enable_pspoll(ah, NULL, 0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment