summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-11-17 09:24:39 +0100
committerJohannes Berg <johannes.berg@intel.com>2015-11-20 11:38:50 +0100
commit5ad11b50fda1306b5317124f97f0a7a4c022b022 (patch)
tree74fb014c750ee90560833713ffb9820985b470d1
parentmac80211: mesh: fix call_rcu() usage (diff)
downloadlinux-5ad11b50fda1306b5317124f97f0a7a4c022b022.tar.xz
linux-5ad11b50fda1306b5317124f97f0a7a4c022b022.zip
mac80211: ensure we don't update tx power on a non-running sdata
We can't update the Tx power on the device unless it is running. This fixes https://bugzilla.kernel.org/show_bug.cgi?id=101521. Cc: stable@vger.kernel.org Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/iface.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index d0dc1bfaeec2..53ee049efbff 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -76,7 +76,8 @@ bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata)
void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata,
bool update_bss)
{
- if (__ieee80211_recalc_txpower(sdata) || update_bss)
+ if (__ieee80211_recalc_txpower(sdata) ||
+ (update_bss && ieee80211_sdata_running(sdata)))
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER);
}