Received: by 2002:a05:7412:37c9:b0:e2:908c:2ebd with SMTP id jz9csp1529985rdb; Wed, 20 Sep 2023 11:39:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGOmZuRpzmi+v3bWedJMfG4j2pqrKNS95OaAoA49kh/uwpS9QWL5r9h0t84MURukIk2B3wv X-Received: by 2002:a05:6358:93a7:b0:139:d24c:ed28 with SMTP id h39-20020a05635893a700b00139d24ced28mr4467621rwb.12.1695235146481; Wed, 20 Sep 2023 11:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695235146; cv=none; d=google.com; s=arc-20160816; b=Yp4jj0j6lCZiyRnoL3U2Qavhky6D45ZUYXwexjIhxIupiXVarJR32DZCk1Tgn/d+7r 3m+oDBQSSKpC02TAZdH2Beqx3CyJeaRP7qBmdu5LmKK3Bk7zpRvxlN7gymIs5qIXYSrG ffl+qpjwhRgBRGiCDu25QTKJWWI4ZjPThrYGow5oTHXVUNQs1VK94QJEhN1lmZrfNRTG vYZPyIvKZqyTG+AJ4K9qarWgxBFFfd9EPeKA3RBpG3UpEF1KLm8ym+ZJZCg2vuqe6W8B C4LwqKh+YmwACY5FXt/CNKZCE23xYEdJd44MlBKkK4LdE0gUSzIeP6doFq/s4YLIOebw 4ziQ== 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=IrG5YKFFCPxfaZ9uKmUP/cHoYVvM9JH8Reqy5FOshL5NeqP+GSDxnUfzDOWTdQfFjB CmTq6MZzET4Q4SDfKQhk85cVvAH7PjsmvbV5p0cUbfFl44sciIeq2zD4PIFp7nBhq7Ib b42fAvzByHwCMS27ScosHekD+XdcXq20c0Rlr1HlytURYEzBIQmEDtl+NVgF+zHvIVOC P0OqLptvslcSImno5wbttCrFc4sem2vy9rzO4cDioKipQwh46egPoeDVZcqW+eHXiHni PoI/QSHCHZFx/nmcmr+SxzomLFDNFwac9VzcmzOHbQOw59eWG1GEAx8ymSisr1b9SUAi uCRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eh1NQBuf; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id bv186-20020a632ec3000000b00578b9757214si3340209pgb.163.2023.09.20.11.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 11:39:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eh1NQBuf; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 5F8CC8286E87; Wed, 20 Sep 2023 11:26:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229832AbjITS0n (ORCPT + 56 others); Wed, 20 Sep 2023 14:26:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229778AbjITS0m (ORCPT ); Wed, 20 Sep 2023 14:26:42 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAD5B102 for ; Wed, 20 Sep 2023 11:26:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695234393; x=1726770393; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+HtDJhZB2j4u2ksLhmW/LRlqH1TmIrp2WCbJFqoGS+0=; b=eh1NQBufX7Ml6UjRisTRiVPCoc1IxaIPcOyAqxpCke9IIqk6g79IS8Bv kEgnHV2RnnoGkb0ysZgnQoiQgAO1o30GpvucqGf16XIhu7P+nJx9wsz+f IoUEVgCPeA3eTldPyvrxrusLELfXEmBOJV5/askgVFEY7LUcGZst4gr6N 3RnwuJI6swL4tQiMlpV7egE4BlHaKdd4T5upNSjLrJJr2P2XAB5ccfx5t m+k0YIWnoQmIWztI+GKh6aZqeXMkm5iUXfq88yAgG7wU/KIL/7wt+teHj ObntAu6kzS8OszFgAIGhu6/y2EgBEDaJUrpjeJ8CAryN16Anyobpmjrz5 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10839"; a="360556395" X-IronPort-AV: E=Sophos;i="6.03,162,1694761200"; d="scan'208";a="360556395" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2023 11:26:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10839"; a="723424240" X-IronPort-AV: E=Sophos;i="6.03,162,1694761200"; d="scan'208";a="723424240" Received: from dmani-mobl1.ger.corp.intel.com (HELO ggreenma-mobl2.lan) ([10.214.217.100]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2023 11:26:31 -0700 From: gregory.greenman@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Ilan Peer , Gregory Greenman Subject: [PATCH v2 09/18] wifi: cfg80211: Fix 6GHz scan configuration Date: Wed, 20 Sep 2023 21:25:20 +0300 Message-Id: <20230920211508.7a593e3aff6c.I6c4e3e3075d1d1878ee41f45190fdc6b86f18708@changeid> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230920182529.659973-1-gregory.greenman@intel.com> References: <20230920182529.659973-1-gregory.greenman@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (howler.vger.email [0.0.0.0]); Wed, 20 Sep 2023 11:26:46 -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