diff options
| author | Andrei Otcheretianski <andrei.otcheretianski@intel.com> | 2015-10-25 10:59:40 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-11-03 10:41:02 +0100 |
| commit | c189a685b83955a39884dc2bdae531bc0adf3b98 (patch) | |
| tree | 778f24fc8ba3e0fb57623d3a58a69bcbb1461a78 | |
| parent | 43d6df007c0cc111ab8ead8bd95aafab9bb4531d (diff) | |
| download | nfc-fixes-c189a685b83955a39884dc2bdae531bc0adf3b98.tar.gz | |
mac80211: Remove WARN_ON_ONCE in ieee80211_recalc_smps
The recalc_smps work can run after the station disassociates.
At this stage we already released the channel, but the work
will be cancelled only when the interface stops.
In this scenario we can hit the warning in ieee80211_recalc_smps, so
just remove it.
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/util.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 7f7ddc527baab0..b0e3a4248bd592 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -2151,7 +2151,13 @@ void ieee80211_recalc_smps(struct ieee80211_sub_if_data *sdata) chanctx_conf = rcu_dereference_protected(sdata->vif.chanctx_conf, lockdep_is_held(&local->chanctx_mtx)); - if (WARN_ON_ONCE(!chanctx_conf)) + /* + * This function can be called from a work, thus it may be possible + * that the chanctx_conf is removed (due to a disconnection, for + * example). + * So nothing should be done in such case. + */ + if (!chanctx_conf) goto unlock; chanctx = container_of(chanctx_conf, struct ieee80211_chanctx, conf); |