mac80211: clear timer bits when disconnecting (2d9957cc) · Commits · 戴 / test

There's a corner case that can happen when we suspend with a timer running, then resume and disconnect. If we connect again, suspend and resume we might start timers that shouldn't be running. Reset the timer flags to avoid this. This affects both mesh and managed modes. Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/mac80211/mesh.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -634,6 +634,8 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
		local->fif_other_bss--;
		atomic_dec(&local->iff_allmultis);
		ieee80211_configure_filter(local);

		sdata->u.mesh.timers_running = 0;
		}

		static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,

net/mac80211/mlme.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1430,6 +1430,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
		del_timer_sync(&sdata->u.mgd.bcn_mon_timer);
		del_timer_sync(&sdata->u.mgd.timer);
		del_timer_sync(&sdata->u.mgd.chswitch_timer);

		sdata->u.mgd.timers_running = 0;
		}

		void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,

Admin message