summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLuis R. Rodriguez2009-09-10 17:57:00 +0200
committerJohn W. Linville2009-10-07 22:39:25 +0200
commit3453ad8839ca91e1c11211d4d87dc3657c5a2b44 (patch)
tree741978ae5458fc04a4c277566a86915a0afc2ff9 /drivers
parentath9k: Use ath9k_hw_setbssidmask() on reset (diff)
downloadkernel-qcow2-linux-3453ad8839ca91e1c11211d4d87dc3657c5a2b44.tar.gz
kernel-qcow2-linux-3453ad8839ca91e1c11211d4d87dc3657c5a2b44.tar.xz
kernel-qcow2-linux-3453ad8839ca91e1c11211d4d87dc3657c5a2b44.zip
ath9k: use ath9k_hw_write_associd() on reset
Use the already provided helper instead of rewriting the code required in place. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 227e40391b09..20c1b3edbd0a 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2476,9 +2476,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
REG_WRITE(ah, AR_DEF_ANTENNA, saveDefAntenna);
- REG_WRITE(ah, AR_BSS_ID0, get_unaligned_le32(sc->curbssid));
- REG_WRITE(ah, AR_BSS_ID1, get_unaligned_le16(sc->curbssid + 4) |
- ((sc->curaid & 0x3fff) << AR_BSS_ID1_AID_S));
+ ath9k_hw_write_associd(ah);
REG_WRITE(ah, AR_ISR, ~0);