From patchwork Mon Mar 31 12:04:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3913861 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 44FA99F357 for ; Mon, 31 Mar 2014 12:10:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F5B220380 for ; Mon, 31 Mar 2014 12:10:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D8F320220 for ; Mon, 31 Mar 2014 12:10:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752328AbaCaMKk (ORCPT ); Mon, 31 Mar 2014 08:10:40 -0400 Received: from mail-we0-f179.google.com ([74.125.82.179]:33400 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752382AbaCaMKe (ORCPT ); Mon, 31 Mar 2014 08:10:34 -0400 Received: by mail-we0-f179.google.com with SMTP id x48so4591941wes.38 for ; Mon, 31 Mar 2014 05:10:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RlGy/q7EYNnCpEkSHVvQUR+VRmAgDnZ6bJdr7VWYlaQ=; b=dAPZf0I/EvI9PVb8aaxYz0wHt0A8X7MinK0g9awdO/5MEEcpOU3PtYE20Aj7DWNE8B sHjn8KfidKbcufL+NPL0K7lzk/LN+yR69t+nX0V286ZIKtzWPGNpPTI/kac0bcyNniVt KgM4JNGM2OuMahPVli9tF+eCjWkPY+SxaRtHQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RlGy/q7EYNnCpEkSHVvQUR+VRmAgDnZ6bJdr7VWYlaQ=; b=CSrDUc/VH2I0YkERLT49BIR9QY2kdprfIyeqmItJZSUQG7ZGgeQAmNqKVzUCGqAooJ 9U8slvKn0Jc89j/oFB9EkUA47a9ZEypBVJ2dHz/1EOPAN4usM2kILtnThSMjR4fC7Ra1 aPG4W/AHZfgFsH+cw1OtM16QGiT7Msra6vuT3PXle4Xf6VMcqlDUXXbOCSVtHXFgoNHU DJVsWhZTiib6LMjI4HHDmolLKnvSrJeZZPdgI2uUBCvz+VIaSz2tSDifVdmtWJ7XgQdZ BXit0WhHQMkg9NnLJRsmb8KR+Oalh8+mWfCwiccr+PuI3nsI8xvl4U0JwKsfd4SCjiqH 9nXg== X-Gm-Message-State: ALoCoQnYXke8a0jCDzUa6xMZqDRCcjHlhalou9Sujc4krvrmdpeHSDxjrygNUG6Ys7NKLKZvnZcfRG4a9KWch5Ft4BrSWleYBWTiTrUFwFLqzvuUL1o5q8k= X-Received: by 10.194.90.107 with SMTP id bv11mr13842729wjb.11.1396267826955; Mon, 31 Mar 2014 05:10:26 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id x45sm32645669eef.15.2014.03.31.05.10.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Mar 2014 05:10:25 -0700 (PDT) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH v3 4/5] mac80211: ignore cqm during csa Date: Mon, 31 Mar 2014 14:04:18 +0200 Message-Id: <1396267459-9976-5-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1396267459-9976-1-git-send-email-michal.kazior@tieto.com> References: <1395409941-26303-1-git-send-email-michal.kazior@tieto.com> <1396267459-9976-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 07a4324..ecf9681 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -983,6 +983,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: mutex_unlock(&local->chanctx_mtx); mutex_unlock(&local->mtx); @@ -3570,6 +3573,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); @@ -3585,6 +3591,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); }