ath9k: Remove redundant chainmask check
authorSujith <Sujith.Manoharan@atheros.com>
Mon, 30 Mar 2009 09:58:24 +0000 (15:28 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Apr 2009 20:54:29 +0000 (16:54 -0400)
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>
drivers/net/wireless/ath9k/hw.c

index 13d8c2a4efae92711fae3e762794e4747814343c..22ef93f3d47c8f0aac8d8e8aac5da98235ecfbff 100644 (file)
@@ -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;