diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-11-17 10:24:39 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-11-20 11:38:50 +0100 |
| commit | 5ad11b50fda1306b5317124f97f0a7a4c022b022 (patch) | |
| tree | 74fb014c750ee90560833713ffb9820985b470d1 /net/mac80211 | |
| parent | c2e703a55245bfff3db53b1f7cbe59f1ee8a4339 (diff) | |
| download | linux-5ad11b50fda1306b5317124f97f0a7a4c022b022.tar.gz linux-5ad11b50fda1306b5317124f97f0a7a4c022b022.tar.bz2 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>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/iface.c | 3 |
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); } |