From: Rafał Miłecki Date: Wed, 23 Jul 2014 16:54:48 +0000 (+0200) Subject: b43: N-PHY: don't calculate values for TSSI if we can't transmit X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e31cd3be75115afcd9372c420c6359be7652610f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: John W. Linville --- 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);