diff options
| author | Felix Fietkau | 2011-09-03 01:40:23 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-09-14 19:56:19 +0200 |
| commit | 82b2d334314c387ebd857b88a3d889c9a2cfec4a (patch) | |
| tree | 3108d4abc5ccf7711306a6e92ed87e6da4532f77 /drivers/net/wireless/ath/ath9k/hw.c | |
| parent | mac80211: stop tx before doing hw config and rate update (diff) | |
| download | kernel-qcow2-linux-82b2d334314c387ebd857b88a3d889c9a2cfec4a.tar.gz kernel-qcow2-linux-82b2d334314c387ebd857b88a3d889c9a2cfec4a.tar.xz kernel-qcow2-linux-82b2d334314c387ebd857b88a3d889c9a2cfec4a.zip | |
ath9k: eliminate common->{rx,tx}_chainmask
we already have ah->{rx,tx}chainmask for the same purpose
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 47d10a4463f1..f2065fce4ec9 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1479,9 +1479,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, u64 tsf = 0; int i, r; - ah->txchainmask = common->tx_chainmask; - ah->rxchainmask = common->rx_chainmask; - if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE)) return -EIO; @@ -2095,6 +2092,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) pCap->tx_chainmask = fixup_chainmask(chip_chainmask, pCap->tx_chainmask); pCap->rx_chainmask = fixup_chainmask(chip_chainmask, pCap->rx_chainmask); + ah->txchainmask = pCap->tx_chainmask; + ah->rxchainmask = pCap->rx_chainmask; ah->misc_mode |= AR_PCU_MIC_NEW_LOC_ENA; |