summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSujith2009-03-30 11:58:24 +0200
committerJohn W. Linville2009-04-22 22:54:29 +0200
commit6ed6a05e5c8061cdcd69a418c90c5f11979ce650 (patch)
tree380a46bae2b7574c31aba53cd25ccbc1621a4c55
parentath9k: Remove a few unused flags (diff)
downloadkernel-qcow2-linux-6ed6a05e5c8061cdcd69a418c90c5f11979ce650.tar.gz
kernel-qcow2-linux-6ed6a05e5c8061cdcd69a418c90c5f11979ce650.tar.xz
kernel-qcow2-linux-6ed6a05e5c8061cdcd69a418c90c5f11979ce650.zip
ath9k: Remove redundant chainmask check
We get the valid chainmasks on HW attach, checking it again during reset is redundant. This patch removes the check. Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath9k/hw.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index 13d8c2a4efae..22ef93f3d47c 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -2189,14 +2189,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
ah->txchainmask = sc->tx_chainmask;
ah->rxchainmask = sc->rx_chainmask;
- if (AR_SREV_9285(ah)) {
- ah->txchainmask &= 0x1;
- ah->rxchainmask &= 0x1;
- } else if (AR_SREV_9280(ah)) {
- ah->txchainmask &= 0x3;
- ah->rxchainmask &= 0x3;
- }
-
if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
return -EIO;