Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 370bd005 authored by Ben Greear's avatar Ben Greear Committed by Johannes Berg
Browse files

mac80211: Don't restart sta-timer if not associated. 



I found another crash when deleting lots of virtual stations
in a congested environment.  I think the problem is that
the ieee80211_mlme_notify_scan_completed could call
ieee80211_restart_sta_timer for a stopped interface
that was about to be deleted.

With the following patch I am unable to reproduce the
crash.

Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
[move check, also make the same change in mesh]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f9f47529

net/mac80211/mesh.c

+2 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,8 @@ void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local) 


	rcu_read_lock();

	list_for_each_entry_rcu(sdata, &local->interfaces, list)

		if (ieee80211_vif_is_mesh(&sdata->vif))

		if (ieee80211_vif_is_mesh(&sdata->vif) &&

		    ieee80211_sdata_running(sdata))

			ieee80211_queue_work(&local->hw, &sdata->work);

	rcu_read_unlock();

}

net/mac80211/mlme.c

+4 −2
Original line number Diff line number Diff line
@@ -3608,8 +3608,10 @@ void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local) 


	/* Restart STA timers */

	rcu_read_lock();

	list_for_each_entry_rcu(sdata, &local->interfaces, list)

	list_for_each_entry_rcu(sdata, &local->interfaces, list) {

		if (ieee80211_sdata_running(sdata))

			ieee80211_restart_sta_timer(sdata);

	}

	rcu_read_unlock();

}