summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-07-23 18:54:48 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-07-23 13:08:36 -0400
commite31cd3be75115afcd9372c420c6359be7652610f (patch)
treeafa42d2e3dd7958027ebf3846472625ac8a01de7 /drivers/net/wireless
parentc0624881187cd06fbcbdc177c507ab589b1b6f1e (diff)
downloadlinux-e31cd3be75115afcd9372c420c6359be7652610f.tar.gz
linux-e31cd3be75115afcd9372c420c6359be7652610f.tar.bz2
linux-e31cd3be75115afcd9372c420c6359be7652610f.zip
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>
Diffstat (limited to 'drivers/net/wireless')
-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)
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);