From: Luis R. Rodriguez Date: Thu, 10 Sep 2009 15:57:00 +0000 (-0700) Subject: ath9k: use ath9k_hw_write_associd() on reset X-Git-Tag: MMI-PSA29.97-13-9~25754^2~865^2~112 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3453ad8839ca91e1c11211d4d87dc3657c5a2b44;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: John W. Linville --- 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);