From patchwork Mon Apr 11 14:21:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilan Peer X-Patchwork-Id: 1615745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=AeKbg78J; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=XV94Ad/8; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KcTzB31Pyz9sCD for ; Mon, 11 Apr 2022 23:21:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KLgskkCPITruT7Ha5JPkrk5AVwGUdyqd/WTrh0cscXM=; b=AeKbg78JcszHsQ ANcue4DpGhp38B1JcOcL4auoV5jco+/BslBpX0z2uRdwix/LSDnmmJIih67is8ZM3yTPPIAghl7PF JdhP7h/gnzXV9vwMtjMaD08jjT74JwcnbjUj2KZwZtA6Sy5tQ7sgsecUbjccRUMUX42c/85ssp4NJ OF4HdERQZFLF0S0FJe5aqoVAVDeO9ETri1iF2TGZ+eRrXWLTf6DwIbg8dlweBVk5b1CDTOm/B0odG GUY2tRrwLLeAN/oO8XVW/ivhbSvEdij22lff36S4ac+AeqklJOEHv3YuYpPZcppZOHDZ/Po2RJ6hw R3rorlhkEo1Sp59smofw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndtyN-0097dF-NL; Mon, 11 Apr 2022 13:20:51 +0000 Received: from mga01.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndtyC-0097Zc-OS for hostap@lists.infradead.org; Mon, 11 Apr 2022 13:20:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649683240; x=1681219240; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=siBLnmfsdh41bAJNnL3wzdNCkuEjP/wFNKDniRQKd3Q=; b=XV94Ad/8BcASTqRWb3mNiMZj6beGNrqWIBCRtg3TLEgO17aht6dIcl3Y 47fvBuIW2tA1eE0Blw4aDrbneD78Xx+zDWRQnZ5GThXLrHk3MdzplfpIN jx1w+5PzRdKblhXDAN37yCPJkUkHoaShQs5l6X+Tw4U3a5KOD3EGb8W2e vKp//Z83jxwtqyheuSyVLWYHToxWQABfvHXdqGmxGI7UGyX0tfVhESihv f54XicyRlDfWaWQoos1K8RaJWZloO73JCViPgXImAoArPQMM3AHgxK1Xx HMu+3sl7gXuRGt6EFiYgfTYsEkLeuUlCz5ZzGZ73ulpfpKQgYtY25mgPA A==; X-IronPort-AV: E=McAfee;i="6400,9594,10313"; a="287121349" X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="287121349" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 06:20:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="801710567" Received: from jed01829.jer.intel.com ([10.12.217.181]) by fmsmga006.fm.intel.com with ESMTP; 11 Apr 2022 06:20:30 -0700 From: Ilan Peer To: hostap@lists.infradead.org Cc: Tova Mussai , Andrei Otcheretianski , Ilan Peer , Avraham Stern Subject: [PATCH v4 1/4] nl80211: set NL80211_SCAN_FLAG_COLOCATED_6GHZ in scan Date: Mon, 11 Apr 2022 17:21:58 +0300 Message-Id: <20220411142201.2770618-1-ilan.peer@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211130153943.3531922-1-andrei.otcheretianski@intel.com> References: <20211130153943.3531922-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_062040_870393_88C8FD20 X-CRM114-Status: GOOD ( 15.22 ) X-Spam-Score: -5.4 (-----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Tova Mussai Set NL80211_SCAN_FLAG_COLOCATED_6GHZ in the scan params to enable scanning for co-located AP's found in 2.4/5 GHz bands when not scanning passively. Do so only when collocated scanning is not disabled [...] Content analysis details: (-5.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [192.55.52.88 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [192.55.52.88 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Tova Mussai Set NL80211_SCAN_FLAG_COLOCATED_6GHZ in the scan params to enable scanning for co-located AP's found in 2.4/5 GHz bands when not scanning passively. Do so only when collocated scanning is not disabled by higher layer logic. Signed-off-by: Tova Mussai Signed-off-by: Andrei Otcheretianski Signed-off-by: Ilan Peer Signed-off-by: Avraham Stern --- src/drivers/driver.h | 10 ++++++++++ src/drivers/driver_nl80211_scan.c | 11 +++++++++++ wpa_supplicant/scan.c | 1 + 3 files changed, 22 insertions(+) diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 111e7e4081..0e31d6e3fc 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -651,6 +651,16 @@ struct wpa_driver_scan_params { */ unsigned int p2p_include_6ghz:1; + /** + * non_coloc_6ghz - force scanning non-PSC 6GHz channels + * + * If this is set, the driver should scan non-PSC channels from the + * scan request even if no co-located AP was reported on these channels. + * The default is to scan non-PSC channels only if a co-located AP was + * reported on the channel. + */ + unsigned int non_coloc_6ghz:1; + /* * NOTE: Whenever adding new parameters here, please make sure * wpa_scan_clone_params() and wpa_scan_free_params() get updated with diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c index 1316084805..31e3308081 100644 --- a/src/drivers/driver_nl80211_scan.c +++ b/src/drivers/driver_nl80211_scan.c @@ -203,6 +203,17 @@ nl80211_scan_common(struct i802_bss *bss, u8 cmd, goto fail; } nla_nest_end(msg, ssids); + + /* + * If allowed, scan for 6GHz APs that are reported by other + * APs. If the flag is not set and 6GHz channels are to be + * scanned, they will be scanned passively. + */ + wpa_printf(MSG_DEBUG, "nl80211: non_coloc_6ghz=%u", + params->non_coloc_6ghz); + + if (!params->non_coloc_6ghz) + scan_flags |= NL80211_SCAN_FLAG_COLOCATED_6GHZ; } else { wpa_printf(MSG_DEBUG, "nl80211: Passive scan requested"); } diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index b0094ca6ca..31b694713b 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -2872,6 +2872,7 @@ wpa_scan_clone_params(const struct wpa_driver_scan_params *src) params->duration = src->duration; params->duration_mandatory = src->duration_mandatory; params->oce_scan = src->oce_scan; + params->non_coloc_6ghz = src->non_coloc_6ghz; if (src->sched_scan_plans_num > 0) { params->sched_scan_plans = From patchwork Mon Apr 11 14:21:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilan Peer X-Patchwork-Id: 1615742 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=FPLqapma; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=AkoqO+52; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KcTz81Xr8z9sCD for ; Mon, 11 Apr 2022 23:21:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ab3SVAs3b1srsHGZz38rCA9RghIHhPFPvBxZjwlZZ5s=; b=FPLqapmaXo1BsQ 5kf7biXFq3Umrog+uVsRmqdgLCWmtBkROCNzv7Qzdz8R896ZbXoL4KYy0zFWTiMo6x9VAgstDPYXU KtavGoNQmcAxwTmmnqWGwIPD1eue63S76z6D1TWHHS7wvl1DybSolDg+bZ2DG63MRAxDDt3SsieUF 1TalYkIWBcCrgvfGImxIRYRpruJQKRt9R1Ej+Z+ybF97IMWiUmBgdVf0XNpeMBPtLI4UB363CQp1b BkOwCY1YRcyxJ3N+zLy2YtCFhmLJKR7+20rqjSX/ncHD7O6/o21FN+QK4F5LX4OMTpKNH+2QbQKeR YP2cxT3MxLKvM7divtPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndtyF-0097bi-Mp; Mon, 11 Apr 2022 13:20:43 +0000 Received: from mga01.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndtyC-0097Zw-Iu for hostap@lists.infradead.org; Mon, 11 Apr 2022 13:20:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649683240; x=1681219240; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e9B6/swgE8byqRWEFdzDpxReABAlznQuIZEqhMmXrbE=; b=AkoqO+52G4h3vM4eitDDS7J1C1fFz6Bg1F7iJ6BH1ywvsKXiiDYFdNfB N3++ahwZI565kRBmYN0zNRXCJm9AlOg1JRTFrMU/sOtt9iBRmPFN+rI2R ndVkMVBAOk7HRs5S6tawuvMIPqnnTXrzajtAHOR+hYrjERniDMYcVKeLk UP6e8zDhsB2KG1JfP2CYZVJQ86SFf5wgXc9VWI0J3HfPTKO1MtQ8CWDhC x6zA1M9DUk2QyYHuSd0EEKFsR0TtAGZ1oHJfvS3PcFTKb4lTHJ2tLk+bZ Lyrv+4+i0I2UzAnAMG2zyM0WiAs5keHQtGKT5fn+0fTTQfl0xbqZbPpu9 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10313"; a="287121357" X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="287121357" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 06:20:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="801710572" Received: from jed01829.jer.intel.com ([10.12.217.181]) by fmsmga006.fm.intel.com with ESMTP; 11 Apr 2022 06:20:32 -0700 From: Ilan Peer To: hostap@lists.infradead.org Cc: Ilan Peer Subject: [PATCH v4 2/4] scan: Add a configuration option to disable 6GHz collocated scanning Date: Mon, 11 Apr 2022 17:21:59 +0300 Message-Id: <20220411142201.2770618-2-ilan.peer@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220411142201.2770618-1-ilan.peer@intel.com> References: <20211130153943.3531922-1-andrei.otcheretianski@intel.com> <20220411142201.2770618-1-ilan.peer@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_062040_679000_460F40A2 X-CRM114-Status: GOOD ( 16.50 ) X-Spam-Score: -5.4 (-----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This configuration option can be used to disable 6GHz collocated scan logic which would result with passively scanning 6GHz non PSC channels. Signed-off-by: Ilan Peer --- wpa_supplicant/config.c | 1 + wpa_supplicant/config.h | 9 +++++++++ wpa_supplicant/config_file.c | 2 ++ wpa_supplicant/p2p_supplicant.c | 1 + wpa_sup [...] Content analysis details: (-5.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [192.55.52.88 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [192.55.52.88 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This configuration option can be used to disable 6GHz collocated scan logic which would result with passively scanning 6GHz non PSC channels. Signed-off-by: Ilan Peer --- wpa_supplicant/config.c | 1 + wpa_supplicant/config.h | 9 +++++++++ wpa_supplicant/config_file.c | 2 ++ wpa_supplicant/p2p_supplicant.c | 1 + wpa_supplicant/scan.c | 7 +++++++ wpa_supplicant/wpa_supplicant.conf | 7 +++++++ 6 files changed, 27 insertions(+) diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 58ed8bc0ae..5b9c9ed7df 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -5265,6 +5265,7 @@ static const struct global_parse_data global_fields[] = { { INT_RANGE(pasn_corrupt_mic, 0, 1), 0 }, #endif /* CONFIG_TESTING_OPTIONS */ #endif /* CONFIG_PASN */ + { INT(non_coloc_6ghz), 0 }, }; #undef FUNC diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h index d22ef05fb8..721e214953 100644 --- a/wpa_supplicant/config.h +++ b/wpa_supplicant/config.h @@ -1699,6 +1699,15 @@ struct wpa_config { #endif /* CONFIG_TESTING_OPTIONS */ #endif /* CONFIG_PASN*/ + + /** + * non_coloc_6ghz - Whether to follow 6GHz collocated scan logic or not + * + * This parameter can be used to disable collocated 6GHz scan logic, + * resulting with passively scanning non PSC channels. By default, 6GHz + * collocated scan logic is enabled. + */ + int non_coloc_6ghz; }; diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c index 9e71185323..0ab588b40f 100644 --- a/wpa_supplicant/config_file.c +++ b/wpa_supplicant/config_file.c @@ -1559,6 +1559,8 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config) if (config->wowlan_disconnect_on_deinit) fprintf(f, "wowlan_disconnect_on_deinit=%d\n", config->wowlan_disconnect_on_deinit); + if (config->non_coloc_6ghz) + fprintf(f, "non_coloc_6ghz=%d\n", config->non_coloc_6ghz); } #endif /* CONFIG_NO_CONFIG_WRITE */ diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index a996b436b4..80ef2a9e4d 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -2188,6 +2188,7 @@ do { \ d->go_venue_group = s->go_venue_group; d->go_venue_type = s->go_venue_type; d->p2p_add_cli_chan = s->p2p_add_cli_chan; + d->non_coloc_6ghz = s->non_coloc_6ghz; } diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 31b694713b..d7c73883e9 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -1328,6 +1328,13 @@ ssid_list_set: } } + if (!params.non_coloc_6ghz && wpa_s->conf->non_coloc_6ghz) { + wpa_dbg(wpa_s, MSG_DEBUG, + "Collocated 6GHz logic is disabled in configuration"); + + params.non_coloc_6ghz = 1; + } + scan_params = ¶ms; scan: diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf index 6619d6ba7f..1f7537cb66 100644 --- a/wpa_supplicant/wpa_supplicant.conf +++ b/wpa_supplicant/wpa_supplicant.conf @@ -132,6 +132,13 @@ ap_scan=1 # 1: Do passive scans. #passive_scan=0 +# Whether to disable 6GHz collocates scan logic +# +# This parameter can be used to disable collocated 6GHz scan logic, +# resulting with passively scanning non PSC channels. By default, 6GHz +# collocated scan logic is enabled. +#non_coloc_6ghz=0 + # MPM residency # By default, wpa_supplicant implements the mesh peering manager (MPM) for an # open mesh. However, if the driver can implement the MPM, you may set this to From patchwork Mon Apr 11 14:22:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilan Peer X-Patchwork-Id: 1615743 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=3al2y0t6; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=HaB/Us29; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KcTz83LDPz9sDX for ; Mon, 11 Apr 2022 23:21:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jKkV/AgOTreHIoRcnJ25X6Y3LdKGpDCaobDFHNG9les=; b=3al2y0t6d43Fzf gDH2cHrBoyKnkPa1Zhh8VR/xo7nnbR83eq0gIXzcrxKnlLlG/SFEdmf5E5Uec1SIbeTePpjWK16+v /p7sbvEA8i5mf8CmSI8gcjikAwWn/dEooPXBmmnPPG1V7BBAoklABx/SZxCYjYJixa4jlyx5Vt8ox EyLuMMr7Lask3/NVpDng073NsGV/2qQOpZftQIVc/RjNTCxcyiVcQLcCO1UHeqDAvk+lQLJp/uKAW /Q5bcHjjl2nINzNq6G5VGKlKMg6UsZ7Cks9tDHelx68sqORg6GO+CG/NWaZQ+qak8kO5Qbh7VIrls UXg5FKBhkrZGkb+aLwgw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndtyV-0097eM-Mo; Mon, 11 Apr 2022 13:20:59 +0000 Received: from mga01.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndtyD-0097aj-Br for hostap@lists.infradead.org; Mon, 11 Apr 2022 13:20:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649683241; x=1681219241; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Js5pq/UG9LQ2Z3TT2TQFljAPaLhxUTuKbp4bt9vJnKA=; b=HaB/Us29OJLKf069ZHtRNJQgLaO9+tO8RDOr+wzIzddeG0lytFYJpOeJ 0newi6rqpAXX6bOIlfWGUvZVZMPi/GYWNVssAj2kBXsQtxRSbYdGUsbrw aIK2ysv/y9ilgHj31R6iNDE0Vv382p9nwcpw1aA7iV3Rm5lYM9ijwJ4QJ kwth0Xgg2Pr4ZJfsBpcr/3+xzN9Xy6H+jNKzLb2Q913p/Ozuv/74HR50R dA39Ty9etnN6qpvOaa1h4oER0ZRW4BA+sWyf2id05/4pNg0+SI8eNfrsX myHYSZpqWkf1QxJxIonP1MxLdjBPKnrZBle5jEbIuy+HRJDyWFrY6k/gG g==; X-IronPort-AV: E=McAfee;i="6400,9594,10313"; a="287121360" X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="287121360" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 06:20:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="801710577" Received: from jed01829.jer.intel.com ([10.12.217.181]) by fmsmga006.fm.intel.com with ESMTP; 11 Apr 2022 06:20:34 -0700 From: Ilan Peer To: hostap@lists.infradead.org Cc: Ilan Peer Subject: [PATCH v4 3/4] tests: Extend 'wpas_config_file' test to cover 'non_coloc_6ghz' Date: Mon, 11 Apr 2022 17:22:00 +0300 Message-Id: <20220411142201.2770618-3-ilan.peer@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220411142201.2770618-1-ilan.peer@intel.com> References: <20211130153943.3531922-1-andrei.otcheretianski@intel.com> <20220411142201.2770618-1-ilan.peer@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_062041_525416_02255F48 X-CRM114-Status: UNSURE ( 9.88 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.4 (-----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Signed-off-by: Ilan Peer --- tests/hwsim/test_wpas_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/hwsim/test_wpas_config.py b/tests/hwsim/test_wpas_config.py index 3cd7dfcf3b..4914fec81a 100644 --- a/tests/hwsim/test_wpas_config.py +++ b/tests/hwsim/test_wpas_config.py @@ -129,7 [...] Content analysis details: (-5.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [192.55.52.88 listed in wl.mailspike.net] -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [192.55.52.88 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Ilan Peer --- tests/hwsim/test_wpas_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/hwsim/test_wpas_config.py b/tests/hwsim/test_wpas_config.py index 3cd7dfcf3b..4914fec81a 100644 --- a/tests/hwsim/test_wpas_config.py +++ b/tests/hwsim/test_wpas_config.py @@ -129,7 +129,8 @@ config_checks = [("ap_scan", "0"), ("p2p_device_random_mac_addr", "1"), ("p2p_device_persistent_mac_addr", "02:12:34:56:78:9a"), ("p2p_interface_random_mac_addr", "1"), - ("openssl_ciphers", "DEFAULT")] + ("openssl_ciphers", "DEFAULT"), + ("non_coloc_6ghz", "1")] def supported_param(capa, field): mesh_params = ["user_mpm", "max_peer_links", "mesh_max_inactivity"] From patchwork Mon Apr 11 14:22:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilan Peer X-Patchwork-Id: 1615744 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=vpy6mBI3; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=YeNH5I3x; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KcTz93MJNz9sFN for ; Mon, 11 Apr 2022 23:21:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PpFsANmzUOhoHgq3ycamm7YWozYDm8cbuGWJkKoeVzQ=; b=vpy6mBI33qIJH7 fL4pm/GusxUEIwahz7gaPtjLFfccgDLd2a++pE4a6hsvPidPrfNQHdPQ/wrKVfaMNELBbCPXg8t/d 8HOFXxJ+BCnu+mVQIoodb4QU/dhGWQdVEXJUzJUsW7wSl+6jK2ibn9jpYltq6xCJb88KWml9GbmZE rumH4wwd9TxBqe/Kh6IaXohKUCFmVW6VCzXfxZO5YefBMywGfCYDOWnF5b92gpVEKOip4qwZpf23P gz6Df5FeTwrn2SOY7dq38lU5RrKWueuTo7smm/GZPWOJ8QeDSnpoO3LKB48VJhkvLKeAUbCK0zpjX RfPRnsaly6mXx2hXlI3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndtyd-0097gC-Vg; Mon, 11 Apr 2022 13:21:08 +0000 Received: from mga01.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndtyE-0097Zc-Ea for hostap@lists.infradead.org; Mon, 11 Apr 2022 13:20:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649683242; x=1681219242; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h8rJN5WjabMxqoB0MIhJUOM+czBRfhBQANLe6+Wmxk4=; b=YeNH5I3xH6MD8Ka7Ln3OZmymioBZpyyoNVEBuw6AQ5urAG+5tbylTo4g El7RZji6Mf65LdFIy8C5wyy5YsiQAX6zKmn4qsuM2Luoef1yEho459nNY Dzj5JXE5raRWA1u8MJHODrOWpkjKa//SoB0fl/L+X1vSTKBkJLSj+Fony YsHoP4Nlu8WDPo/9PiZgrT/ipy+bObNZnzqutUGzJ7wqikt9vbajZUmFv dtLQJPX8BHCxmGq7xP3XYcdlSchEiIAeIhyGr/koTfSndf87HGJyTijEA /U6WvdTQBK614u5tJTarkcsXw6xITicLvNltuMLWhc1dWv8tL1fkk/b7p w==; X-IronPort-AV: E=McAfee;i="6400,9594,10313"; a="287121362" X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="287121362" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 06:20:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="801710581" Received: from jed01829.jer.intel.com ([10.12.217.181]) by fmsmga006.fm.intel.com with ESMTP; 11 Apr 2022 06:20:35 -0700 From: Ilan Peer To: hostap@lists.infradead.org Cc: Ilan Peer Subject: [PATCH v4 4/4] P2P: Do not use collocated scan logic when scanning 6GHz Date: Mon, 11 Apr 2022 17:22:01 +0300 Message-Id: <20220411142201.2770618-4-ilan.peer@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220411142201.2770618-1-ilan.peer@intel.com> References: <20211130153943.3531922-1-andrei.otcheretianski@intel.com> <20220411142201.2770618-1-ilan.peer@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_062042_546537_3CD82804 X-CRM114-Status: GOOD ( 12.14 ) X-Spam-Score: -5.4 (-----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Passively scan 6GHz channels during P2P find full scan as P2P GOs are not expected to be published in RNR or other APs on the 2GHz and 5GHz bands. Signed-off-by: Ilan Peer --- wpa_supplicant/p2p_supplicant.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) Content analysis details: (-5.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [192.55.52.88 listed in wl.mailspike.net] -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [192.55.52.88 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Passively scan 6GHz channels during P2P find full scan as P2P GOs are not expected to be published in RNR or other APs on the 2GHz and 5GHz bands. Signed-off-by: Ilan Peer --- wpa_supplicant/p2p_supplicant.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 80ef2a9e4d..e92b7ae35a 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -444,8 +444,16 @@ static int wpas_p2p_scan(void *ctx, enum p2p_scan_type type, int freq, num_req_dev_types, req_dev_types); if (wps_ie == NULL) goto fail; - if (!wpa_s->conf->p2p_6ghz_disable) + if (!wpa_s->conf->p2p_6ghz_disable) { params->p2p_include_6ghz = include_6ghz; + + /* + * passively scan non PSC channels without relying on collocated + * logic + */ + params->non_coloc_6ghz = include_6ghz; + } + switch (type) { case P2P_SCAN_SOCIAL: params->freqs = os_calloc(ARRAY_SIZE(social_channels_freq) + 1,