mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
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: Michal Kazior <michal.kazior@tieto.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
f04c22033c
commit
e5593f56eb
1 changed files with 9 additions and 0 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue