aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/hw.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-09-02 19:40:23 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-14 13:56:19 -0400
commit82b2d334314c387ebd857b88a3d889c9a2cfec4a (patch)
tree3108d4abc5ccf7711306a6e92ed87e6da4532f77 /drivers/net/wireless/ath/ath9k/hw.c
parent693828fe92933ce4fff4c1e51365b2e6ab033b0e (diff)
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.c5
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 47d10a4463f..f2065fce4ec 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,
1479 u64 tsf = 0; 1479 u64 tsf = 0;
1480 int i, r; 1480 int i, r;
1481 1481
1482 ah->txchainmask = common->tx_chainmask;
1483 ah->rxchainmask = common->rx_chainmask;
1484
1485 if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE)) 1482 if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
1486 return -EIO; 1483 return -EIO;
1487 1484
@@ -2095,6 +2092,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
2095 2092
2096 pCap->tx_chainmask = fixup_chainmask(chip_chainmask, pCap->tx_chainmask); 2093 pCap->tx_chainmask = fixup_chainmask(chip_chainmask, pCap->tx_chainmask);
2097 pCap->rx_chainmask = fixup_chainmask(chip_chainmask, pCap->rx_chainmask); 2094 pCap->rx_chainmask = fixup_chainmask(chip_chainmask, pCap->rx_chainmask);
2095 ah->txchainmask = pCap->tx_chainmask;
2096 ah->rxchainmask = pCap->rx_chainmask;
2098 2097
2099 ah->misc_mode |= AR_PCU_MIC_NEW_LOC_ENA; 2098 ah->misc_mode |= AR_PCU_MIC_NEW_LOC_ENA;
2100 2099