Received: by 2002:a05:7412:37c9:b0:e2:908c:2ebd with SMTP id jz9csp805487rdb; Tue, 19 Sep 2023 10:35:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESiM88C1lP4G3M6Y3jWyZ+nNtszeONKLLH/YOV4fA7nWJq0t+BQhFw04Z1xNfYjTum4/nV X-Received: by 2002:a17:903:428c:b0:1c3:7628:fcb3 with SMTP id ju12-20020a170903428c00b001c37628fcb3mr61468plb.47.1695144936580; Tue, 19 Sep 2023 10:35:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695144936; cv=none; d=google.com; s=arc-20160816; b=BW/QuU1I0HlJv0WdeQfJSAoSHRFyxpWhrVJMRMGTT7rznZASIBUNVWSayJ8UCSS1uG TYRkiPjaJV5GYl5YGbJIb7U+VZ8vPbcAp4R9l2dlQDDFeqOVLwhIasaacxAK8QibnHLX M4rordzw6Kc4lCTcvKLD83VsIoSH9ARc68BMxJJFMe7h5Y+WS2XcRJ7njY41XFGQlmUg hqelf5mjR1JZXjov11LpSZ5OwZY6kBQclR+TQIOjw8qGTkLNMppA2YRE+Qgv8gQX2nYq 7vu06YBwuJQX6o7dqFuGBgHM+B161qgxXoybmPb7iOtjVAkhhkBWzs6PmQMt0yCwtjMt Vq1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zWrOPnbhu1VwwEOVUM9Z8WVGKtvueTvxBLNq94LnPKU=; fh=/GEb7gVUqTR6q5QKTfw0XUP5VVlqVBkkw8R/kfrGqdo=; b=nLNTjZEe8x1+wsdbh9cdYgtyieIJaByNVzdCJ17bcCcSdd0Xd6PgrxA6QUsfhoSYLy uNUkijd1rDEehY0YEg/S4dhsPwXHUuuOPbxkw3oOL+Ejw3+8Una658mz9t+TCdQ3uwLJ elpxgzFORZA8VDzT1YCL/vbuYfNP2w10gQjgGfjSY+Ju4cTAhpGz16bm7AlVY7uXBi3N kaJhdXa+1+mnfgN5DdyvrODbO4Atafa0YwksbObabO2dtWVwsgE2BAj+ouZrBwiM2SKr TnGyIMflbMwoumOKfx6jz3KNpc47hrL09OGjkJyAdFnB/Z08sIYRHwhn7NOfeCHntivl Rq9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="S+NDyn/E"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id m3-20020a170902db0300b001b8a699d248si7428402plx.389.2023.09.19.10.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 10:35:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="S+NDyn/E"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 80D958062342; Mon, 18 Sep 2023 04:12:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241404AbjIRLM1 (ORCPT + 57 others); Mon, 18 Sep 2023 07:12:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241429AbjIRLL4 (ORCPT ); Mon, 18 Sep 2023 07:11:56 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F34ED102 for ; Mon, 18 Sep 2023 04:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695035508; x=1726571508; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+HtDJhZB2j4u2ksLhmW/LRlqH1TmIrp2WCbJFqoGS+0=; b=S+NDyn/E6qbItUEPgQMJn9w5j9ckSyFf2EUYpwN8OyQqcL16UMB9M0/Q NjLB6E8rnkQhRYAshwmRdMmQIOOZd8viNUquO+gNAP+us1wuL2DLW/ycb kf9weyQ8WRCIYNM2MbPuxvhG3DBcLhdPqj5j7S3afbmgUVyWAmvHwLjBd ZJ7ekhwAl/N2dr6k66zGALumzunoorIRNrjUQwbW2fTexRIk+FM6JZ5Gx EyGY31e2KMYqE8nWsGa+E3BvocAh1fpVZUkkJ/d27ZH988nA/834UxNQC CbaxkUIfxovbFu08qVGL+uk2rkqU9F+K8bTZUPVSxIPTx5g74mF4abd4c w==; X-IronPort-AV: E=McAfee;i="6600,9927,10836"; a="378535781" X-IronPort-AV: E=Sophos;i="6.02,156,1688454000"; d="scan'208";a="378535781" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2023 04:11:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10836"; a="861025342" X-IronPort-AV: E=Sophos;i="6.02,156,1688454000"; d="scan'208";a="861025342" Received: from guyarad-mobl.ger.corp.intel.com (HELO ggreenma-mobl2.lan) ([10.214.215.14]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2023 04:11:39 -0700 From: gregory.greenman@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Ilan Peer , Gregory Greenman Subject: [PATCH 09/18] wifi: cfg80211: Fix 6GHz scan configuration Date: Mon, 18 Sep 2023 14:10:54 +0300 Message-Id: <20230918140607.6d31d2a96baf.I6c4e3e3075d1d1878ee41f45190fdc6b86f18708@changeid> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230918111103.435195-1-gregory.greenman@intel.com> References: <20230918111103.435195-1-gregory.greenman@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 18 Sep 2023 04:12:43 -0700 (PDT) From: Ilan Peer When the scan request includes a non broadcast BSSID, when adding the scan parameters for 6GHz collocated scanning, do not include entries that do not match the given BSSID. Signed-off-by: Ilan Peer Signed-off-by: Gregory Greenman --- net/wireless/scan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/wireless/scan.c b/net/wireless/scan.c index a5758edf53b8..8d114faf4842 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -908,6 +908,10 @@ static int cfg80211_scan_6ghz(struct cfg80211_registered_device *rdev) !cfg80211_find_ssid_match(ap, request)) continue; + if (!is_broadcast_ether_addr(request->bssid) && + !ether_addr_equal(request->bssid, ap->bssid)) + continue; + if (!request->n_ssids && ap->multi_bss && !ap->transmitted_bssid) continue; -- 2.38.1