Return-path: Received: from mail-ee0-f48.google.com ([74.125.83.48]:57328 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760838AbaCUN6P (ORCPT ); Fri, 21 Mar 2014 09:58:15 -0400 Received: by mail-ee0-f48.google.com with SMTP id b57so1832605eek.35 for ; Fri, 21 Mar 2014 06:58:14 -0700 (PDT) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH v2 5/7] mac80211: ignore cqm during csa Date: Fri, 21 Mar 2014 14:52:19 +0100 Message-Id: <1395409941-26303-6-git-send-email-michal.kazior@tieto.com> (sfid-20140321_145822_479766_24419403) In-Reply-To: <1395409941-26303-1-git-send-email-michal.kazior@tieto.com> References: <1395150804-24090-1-git-send-email-michal.kazior@tieto.com> <1395409941-26303-1-git-send-email-michal.kazior@tieto.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: 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 --- net/mac80211/mlme.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index a5b23a1..4304988 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -974,6 +974,9 @@ cleanup: ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED; + ieee80211_sta_reset_beacon_monitor(sdata); + ieee80211_sta_reset_conn_monitor(sdata); + out: mutex_unlock(&local->chanctx_mtx); mutex_unlock(&local->mtx); @@ -3555,6 +3558,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); @@ -3570,6 +3576,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); } -- 1.8.5.3