Browse Source

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>
Andrei Otcheretianski 9 years ago
parent
commit
c189a685b8
1 changed files with 7 additions and 1 deletions
  1. 7 1
      net/mac80211/util.c

+ 7 - 1
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,
 	chanctx_conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
 					lockdep_is_held(&local->chanctx_mtx));
 					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;
 		goto unlock;
 
 
 	chanctx = container_of(chanctx_conf, struct ieee80211_chanctx, conf);
 	chanctx = container_of(chanctx_conf, struct ieee80211_chanctx, conf);