Messages in this thread Patch in this message | | | From | Luis Henriques <> | Subject | [PATCH 3.16.y-ckt 106/126] mac80211: ensure we don't update tx power on a non-running sdata | Date | Wed, 6 Jan 2016 10:37:15 +0000 |
| |
3.16.7-ckt22 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
commit 5ad11b50fda1306b5317124f97f0a7a4c022b022 upstream.
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.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> [ luis: backported to 3.16: adjusted context ] Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- net/mac80211/iface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 0af1778345b8..da555f878db7 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -74,7 +74,8 @@ bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata) void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata) { - if (__ieee80211_recalc_txpower(sdata)) + if (__ieee80211_recalc_txpower(sdata) || + ieee80211_sdata_running(sdata)) ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER); }
| |