From patchwork Tue Mar 18 13:53:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3853641 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4739CBF540 for ; Wed, 19 Mar 2014 17:45:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DEB82203B5 for ; Wed, 19 Mar 2014 17:45:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B4DE20149 for ; Wed, 19 Mar 2014 17:45:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755086AbaCRN7h (ORCPT ); Tue, 18 Mar 2014 09:59:37 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:44713 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755060AbaCRN7c (ORCPT ); Tue, 18 Mar 2014 09:59:32 -0400 Received: by mail-ee0-f46.google.com with SMTP id t10so5301058eei.5 for ; Tue, 18 Mar 2014 06:59:31 -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=6ITBO4+IO6ct/ZZ2a5S8/N+T+BpKUS0e74IcVJ9MNaA=; b=Sx80IujlZqgHU6uvFfU/8w6ZQCoXyR5zf60xHo0cSmC60UOjMnCzkIELDyHvBptP35 AEgsJGVQ4798Y+gzeb0qnGL/ojmlPOEz8lRopd97YU//kQyBZlAbNo14Hjgk2we3eg9e khQsJ05jSg3gsXW3by26erW43SZrn0KQA3be8= 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=6ITBO4+IO6ct/ZZ2a5S8/N+T+BpKUS0e74IcVJ9MNaA=; b=E6hybIsmCHYnckzPUlAtkt0ndd0i+YGrIlsPYjAv/l45RdaByYwTYWHMh0McpnzOnq Pj6ErMjFJl5RGwuYyYuejhOOe19xUhe0Tz0y8Vroqos9kFePiZfBr528/d6vIANxNuZh mmyHmRZ8ASN6m4TPnWQ4ytL3LdsEUiA/KwdwVnRwNcKn76sO+gE/n/B8ks/OD/EjKru7 RMUW2om6yra6BcIXHRPHQR68OOGRMI8vJ4z7ZkvR4XE7FhrhzCnn1GFEYBRPGOzOYg3g nmCtvYT3T3b5P4Ns5Q79sBEz530+2n8a2QKavGp1hoEW0zYTMQy/TnSAId2zdl04N3C3 +gSw== X-Gm-Message-State: ALoCoQkPPa/yd6pklhGalBbOHIf0V4YQcY/4OsRZtoQbzW6bvF2bThGF72OcEPVj4vM+tNzqES+QzNwOn5JcbueMLs5MS5AYWa8gp+ndbLKDzBrQZ4NkgGE= X-Received: by 10.14.203.5 with SMTP id e5mr2673150eeo.105.1395151171602; Tue, 18 Mar 2014 06:59:31 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id x45sm35223167eeu.23.2014.03.18.06.59.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Mar 2014 06:59:30 -0700 (PDT) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [RFC 19/21] mac80211: ignore cqm during csa Date: Tue, 18 Mar 2014 14:53:22 +0100 Message-Id: <1395150804-24090-20-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1395150804-24090-1-git-send-email-michal.kazior@tieto.com> References: <1395150804-24090-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=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 e729da3..c654a1c 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -997,6 +997,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); @@ -3586,6 +3589,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); @@ -3601,6 +3607,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); }