aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-07-23 12:54:48 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-07-23 13:08:36 -0400
commite31cd3be75115afcd9372c420c6359be7652610f (patch)
treeafa42d2e3dd7958027ebf3846472625ac8a01de7
parentc0624881187cd06fbcbdc177c507ab589b1b6f1e (diff)
b43: N-PHY: don't calculate values for TSSI if we can't transmit
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>
-rw-r--r--drivers/net/wireless/b43/phy_n.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 44bb58b748dd..d269fbb27b9e 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -3957,7 +3957,8 @@ static void b43_nphy_tx_power_ctl_idle_tssi(struct b43_wldev *dev)
3957 u32 tmp; 3957 u32 tmp;
3958 s32 rssi[4] = { }; 3958 s32 rssi[4] = { };
3959 3959
3960 /* TODO: check if we can transmit */ 3960 if (phy->chandef->chan->flags & IEEE80211_CHAN_NO_IR)
3961 return;
3961 3962
3962 if (b43_nphy_ipa(dev)) 3963 if (b43_nphy_ipa(dev))
3963 b43_nphy_ipa_internal_tssi_setup(dev); 3964 b43_nphy_ipa_internal_tssi_setup(dev);