b43: N-PHY: don't calculate values for TSSI if we can't transmit
authorRafał Miłecki <zajec5@gmail.com>
Wed, 23 Jul 2014 16:54:48 +0000 (18:54 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Jul 2014 17:08:36 +0000 (13:08 -0400)
This process requires sending some sample tone, so make sure we're
allowed to transmit first.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/phy_n.c

index 44bb58b748dd584b61d75b8fe0574211a84e1e4f..d269fbb27b9ebabbc66db7b41263cf316aee463d 100644 (file)
@@ -3957,7 +3957,8 @@ static void b43_nphy_tx_power_ctl_idle_tssi(struct b43_wldev *dev)
        u32 tmp;
        s32 rssi[4] = { };
 
-       /* TODO: check if we can transmit */
+       if (phy->chandef->chan->flags & IEEE80211_CHAN_NO_IR)
+               return;
 
        if (b43_nphy_ipa(dev))
                b43_nphy_ipa_internal_tssi_setup(dev);