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

Commit e5593f56 authored by Michal Kazior's avatar Michal Kazior Committed by Johannes Berg
Browse files

mac80211: ignore cqm during csa 



It is not guaranteed that multi-vif channel
switching is tightly synchronized. It makes sense
to ignore cqm (missing beacons, et al) while csa
is progressing and re-check it after it completes.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f04c2203

net/mac80211/mlme.c

+9 −0
Original line number Diff line number Diff line
@@ -988,6 +988,9 @@ static void ieee80211_chswitch_work(struct work_struct *work) 


	ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED;



	ieee80211_sta_reset_beacon_monitor(sdata);

	ieee80211_sta_reset_conn_monitor(sdata);



out:

	sdata_unlock(sdata);

}
@@ -3565,6 +3568,9 @@ static void ieee80211_sta_bcn_mon_timer(unsigned long data) 
	if (local->quiescing)

		return;



	if (sdata->vif.csa_active)

		return;



	sdata->u.mgd.connection_loss = false;

	ieee80211_queue_work(&sdata->local->hw,

			     &sdata->u.mgd.beacon_connection_loss_work);
@@ -3580,6 +3586,9 @@ static void ieee80211_sta_conn_mon_timer(unsigned long data) 
	if (local->quiescing)

		return;



	if (sdata->vif.csa_active)

		return;



	ieee80211_queue_work(&local->hw, &ifmgd->monitor_work);

}