From patchwork Tue Nov 14 12:47:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jurijs Soloveckis X-Patchwork-Id: 1863646 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=RGORH9rq; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=maxlinear.com header.i=@maxlinear.com header.a=rsa-sha256 header.s=selector1 header.b=T9B3Ze1E; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SV5gY6QcQz1yR8 for ; Tue, 14 Nov 2023 23:48:09 +1100 (AEDT) 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:Message-ID:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=wVXcsgrpksDQ1MwcII9vGNAp2cLP/2XMFDwfTVN52Xc=; b=RGORH9rqR0EGlx pypyXdhmORSsv6vUOgwZYhFDr+jcDFb+AvBtZBDbV/Tl14QfAcD41Ur8IGP3DT033Dk/zwf3AF/1o ZToQp+mVvZarnB2nrhAovD3obe20mOy9GDKT5K9Xska5PyAwaTTM/NVOo7c+b3BLJ3qgPfRPReonR DALY2oWKVJeYlDul4Ca31SrapGNWQLiNSP7EgSn9/EPxHv+SN/z5268OycxeAcm6Anrb852ZRJGHX eq/YD7mSbn2muO9DPfGllevEcdgGlSdAsX9mmFN2eT8C+Dfnu81s30ELR975xdPq9sCgEkKT5LrSs VgSsSQJb1e1cbd6KxC9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r2sp5-00FxP5-0k; Tue, 14 Nov 2023 12:47:19 +0000 Received: from mail-bn7nam10on20725.outbound.protection.outlook.com ([2a01:111:f400:7e8a::725] helo=NAM10-BN7-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r2sox-00FxMX-0w for hostap@lists.infradead.org; Tue, 14 Nov 2023 12:47:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=COjm8CMWhBMY34v/H3c07U/lMi5Y2jFXHEpYaSTg/WG+GNjP49hqvUQE0j9mNGDo6NgRVyt8h4g93nlO07vEv8Z+1mKhaQsE2H4VQVB2CfXpC1MjHrwpbIIiluJD0j4dtKJTvalj3SHlo5x6GO8lgjSvzH5w43u0NbbpNoZGyTqV9PwYOBkBQ7/ZcoxVlUgmCbqdcnOjoS2FIWdruNomB6MWddviEvdWt3GPj7WfM7o6LGryTUZqfCgwrHBwmGcsvV/0XDxY503so0OIVbM/lHYUM1ZsHJHMRDo9n+9+BrwkoB6dzuQT16R2Z7lKiK0Z7BZel9HHKTz1hzsWbuhJIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hL6OVI3dZiSu+eZh6JGf1JWVT1Qr65lg3aYMJABqGKo=; b=XMeOMMKnrjDRpRRIgBr94KeGL4uDmCxFmjM0IgZ47gb09NK4ck3CSGDULw7zrmqr8ngIvHxd2+EZlSoN5QDQJypT/mRJNe0qa5GAxb6e/5xzSYYEsj8qyZZsJWXSQDOBGD5AsXxFi6XQK0c/tsV29Bom3nDF2ZF+vGu5/UuWiRZp1mFn1UgmIXUGQrnUB7hVRjRTA1OrN03onGlSWp5Oy/XZqaBXoIU+UtDkdSrjiBY9NN2/Yyr4x1NUAF6wrbsTZsU5woJlzdJZ427SklmBC0inGuFlVpkSKGy69Fs3bf5dxjZuE+MyYLgEkF/TcC11tltIk5rCXWjP27GkWTNy9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=maxlinear.com; dmarc=pass action=none header.from=maxlinear.com; dkim=pass header.d=maxlinear.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maxlinear.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hL6OVI3dZiSu+eZh6JGf1JWVT1Qr65lg3aYMJABqGKo=; b=T9B3Ze1ESBXEnvh5YAQY8jyv4RmRDK0QqjQz6UVJykdFYdJl5o3GvsuXICTmvhX7IMWiCKAJAB11uvixe/vIYqPHWRjFuY5Hy3nmheTe2QI3MvPlqO5k0hp9Qdyqyi0kxH2DQ8i+HPu1bAVNZtndfPuspEk2hKxE+naDdEwaygs= Received: from DM4PR19MB6173.namprd19.prod.outlook.com (2603:10b6:8:b3::17) by SJ0PR19MB6816.namprd19.prod.outlook.com (2603:10b6:a03:47b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Tue, 14 Nov 2023 12:47:06 +0000 Received: from DM4PR19MB6173.namprd19.prod.outlook.com ([fe80::bb04:71b3:2ed2:b54e]) by DM4PR19MB6173.namprd19.prod.outlook.com ([fe80::bb04:71b3:2ed2:b54e%6]) with mapi id 15.20.6977.029; Tue, 14 Nov 2023 12:47:06 +0000 From: Jurijs Soloveckis To: "hostap@lists.infradead.org" Subject: [PATCH] Include EHT Operation Information field only if 320MHz and/or if at least one punctured 20MHz subchannel Thread-Topic: [PATCH] Include EHT Operation Information field only if 320MHz and/or if at least one punctured 20MHz subchannel Thread-Index: AdoW+JzQvdFoCF4KTF2lnUMvepKAjQ== Date: Tue, 14 Nov 2023 12:47:05 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=maxlinear.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM4PR19MB6173:EE_|SJ0PR19MB6816:EE_ x-ms-office365-filtering-correlation-id: 527cbea3-9cc6-46bf-bfc4-08dbe50fced2 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 4PV6d+cLoLYGAlp7ut9rUU/spRWl1+RPw/I31gp45hKXhRYcegjyi2LLdhgkpaRuZn4+s9BoPQnzMyeNHVzAmIGl3CEmSrhBiZldGVJAiUJyuxYw2hRG7ZNuzHRWutWuEpA6A7lfGj+2uD+rdVf62TfW8GeGG8+idwdA3C6NAFWEsML3KMQBqqIar21duqGF5heVr8nDofvHqL7r5wJBi6S17tVrXUvAYJyGySfaP407rBJXOyhK4e7TDrbhI6s4MhcxXgtpI2ADsCxiHVMkQZpKGt38EZzP0/wjtD5ZjVTdRRhgqErl0+VDhzVQ4sJ5oeYTmn410JzHF1MXT52ohvu6z0P9Q8jfcOfPhkqZ0U4crtkUq0YPVedeFuUXpZd/JiLLU4vX0YDCxWxdLgYOdsNAHN1yDEAgyGaiPS8sbMFnoa1+NvS+4y8NYIaFwLsKhZ7kxEJAK+qU4O3Gt2EyWVGmnexrD8aftRR8pD3QLVl1GJ7nIC5emYjJZBUgL23DZ898vrd2aHJGO82mIZW43n5qdB0MsydoOBfLnh8D4w+tFWVLVwnmIHaRwsYxuerd3RbH9l1dsYDd18SwWHzkjLffIoIRqSvG0R7Icjql/Pu/oUAeYtpsTj4W7VWQcDTC x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR19MB6173.namprd19.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39850400004)(396003)(376002)(366004)(346002)(136003)(230922051799003)(1800799009)(64100799003)(186009)(451199024)(33656002)(122000001)(86362001)(83380400001)(26005)(71200400001)(66946007)(5660300002)(6506007)(8936002)(7696005)(9686003)(478600001)(38070700009)(316002)(52536014)(41300700001)(66476007)(55016003)(66446008)(66556008)(38100700002)(64756008)(76116006)(6916009)(8676002)(2906002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: TlM4GP2jzcfGpmlJunjAqjbYAyU7NHRNCIx/82FoVrVZazV8K5SHmsbgBbtH0Y0xk8s8RgI8+uE/M4zTbpcW8Snupz9EsMBMsB9VUNKPauY5GvOlmujpLM7SZDIF5t2aBvI72FUBRW/AfC+feCcuOzCuk87eVhfgiAt6bOgYJJUNhGKBTmdi42okkTiVnVNFh6y/ZTFYx5SpfohLV7OSlfEYVsydj4lJP18WIxdEA8wEd1n7b2/vEIuHCqtepFZZca8rKN7/mYRHZVmKdc0BqhFlPQNcDQRuyJbBZ0zb2tbhu1wRqfOJd/O+T7aE+ibxylJ+XS2JHrVaqMPRhMwjr7r3CsTpQB0hbGFOE1CpQvMrRaaywRHSjqXsLqUy+voBNomEKxt8yTBdB6YzxEGge+neaKr8M7QN+iVo4Lrf5DAQY7Eclk5B5cwRoaQPRu8PaRgWF/PYAWavjMX/M7fRpbiUCFDy1CehYbosYk4pBAjuP1ow+Wqzf43Ne8YWS3zYJQf2LFLL5BKUdQM0g+apVddyj1KnI7RDScxhBdOZbWrKzlPvtPgqFagSaFQCojszayziOx81NmgTsQx7/IwQPskVtC5JeK9f1BT6JKkKpnMj7N9EpcwE6QDWmmardj23NONQhltgoouOqEZnwBc/uoZRXbRPUWCgd5nHBTps3Tov9DFhFQnzxho2D4R6o5LkP5FXXjgKuVJidFt5cJtYUYbixWYzdtZQCbemDhZQi/2euTnyLS6lvLdefW8crU54+Lh9F+UcL+COx7E+MCLFMwKXNzmZVn9AufrIf3OPXw95fiUZj0nBYZjkFC2MrBGt+/qZv3k/KHQXDttGQktsULTamjb66sNWY7l/ZqYkLAyosXuIA7a6RYabPBm7xdMKogqeFBeRAkXu3GjtzbZXBKYI+fdqHu/SCii1Q7YyfwNOGeaNz6W4ayLGnPhbjAYr8CfFarl4bmSn+noXtxiVsNd1DULku3+ubXbjWpyDil90PcKSHR+9CS8TVDTMGBeCuS72nWB+ABl8Ram2nncXKjlNfdsjHqnNS8HH5b32H2NfWqXRzRmglfzOKRraioImsmYsO98yZHrYPioKMrdVZe4Mq2rMhT/iwYV4++VmSIppMJBaWLo5BWMsbKVZ7IgRujbxtfttIUvl5YOHNvhRLptIw65VrZopo2rV0uwsGM/z6dBYI1FsFoaUbtudTIJiqiwl2oxL4U+V8k2qROqrYlWdnkEdBHBbLgwsMVNINhQK+2AzV2zKFCuEvQFEPz6ICNEaIe6PjWBc9Ffnwxt9ywgR2qZQseDLF/hN2TBfk07CK2B/6KF5vVwVT9lysavkFAvxV9MbvRYipq5abHyjRtKY0TXAznJqw/oCNNtxbjTt9DRVgp+vWXeCGbBCmUvq9Y3BiQL4teAyERWX0c3W/pg5aoVhUesWeptyy+jt5aQ4OV6CU0NL3WTt0AM2fdIRmA+BE79DxsYeibKZE/lIAIDnEMSxwRCJs2POs0BD2zg4dguMQzWfuQHnmokIggWBHjuZZ+iOGvRSTV7o56EF15JrNo6XsprDFpWrPKqSnh8A6NQBdIhqngbCw314IrRUScB5zcdAUYo4NTvBNeOucQ== MIME-Version: 1.0 X-OriginatorOrg: maxlinear.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR19MB6173.namprd19.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 527cbea3-9cc6-46bf-bfc4-08dbe50fced2 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Nov 2023 12:47:05.9921 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: dac28005-13e0-41b8-8280-7663835f2b1d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: UMa7PYFizjjI19vGPqtAjrNmQHwd2GZOA62bxSHrn/BfmSWYtLZSwcGQLmxaaT/0fDswmEPEmVsA6GMHC5ZCwQn6HGoSnpSRqe+6cwEd8Lc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR19MB6816 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231114_044711_350440_F3C274E3 X-CRM114-Status: GOOD ( 10.74 ) X-Spam-Score: -0.2 (/) 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: 802.11be D3 chapter 35.15.1 Basic EHT BSS operation defines: EHT AP shall include EHT Operation Information field only if at least one punctured 20MHz subchannel and/or is 320MHz. Otherwise, the EHT A [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches 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 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 802.11be D3 chapter 35.15.1 Basic EHT BSS operation defines: EHT AP shall include EHT Operation Information field only if at least one punctured 20MHz subchannel and/or is 320MHz. Otherwise, the EHT AP shall set the EHT Operation Information Present subfield to 0. Signed-off-by: Jurijs Soloveckis --- src/ap/ieee802_11_eht.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/ap/ieee802_11_eht.c b/src/ap/ieee802_11_eht.c index 1d1751837..27df569a1 100644 --- a/src/ap/ieee802_11_eht.c +++ b/src/ap/ieee802_11_eht.c @@ -199,11 +199,23 @@ u8 * hostapd_eid_eht_operation(struct hostapd_data *hapd, u8 *eid) struct ieee80211_eht_operation *oper; u8 *pos = eid, seg0 = 0, seg1 = 0; enum oper_chan_width chwidth; - size_t elen = 1 + 4 + 3; + size_t elen = 1 + 4; + bool eht_oper_info_present = false; if (!hapd->iface->current_mode) return eid; + if (is_6ghz_op_class(conf->op_class)) + chwidth = op_class_to_ch_width(conf->op_class); + else + chwidth = conf->eht_oper_chwidth; + + eht_oper_info_present = (chwidth == CONF_OPER_CHWIDTH_320MHZ) || + hapd->iconf->punct_bitmap; + + if (eht_oper_info_present) + elen += 3; + if (hapd->iconf->punct_bitmap) elen += EHT_OPER_DISABLED_SUBCHAN_BITMAP_SIZE; @@ -212,7 +224,6 @@ u8 * hostapd_eid_eht_operation(struct hostapd_data *hapd, u8 *eid) *pos++ = WLAN_EID_EXT_EHT_OPERATION; oper = (struct ieee80211_eht_operation *) pos; - oper->oper_params = EHT_OPER_INFO_PRESENT; /* TODO: Fill in appropriate EHT-MCS max Nss information */ oper->basic_eht_mcs_nss_set[0] = 0x11; @@ -220,11 +231,10 @@ u8 * hostapd_eid_eht_operation(struct hostapd_data *hapd, u8 *eid) oper->basic_eht_mcs_nss_set[2] = 0x00; oper->basic_eht_mcs_nss_set[3] = 0x00; - if (is_6ghz_op_class(conf->op_class)) - chwidth = op_class_to_ch_width(conf->op_class); - else - chwidth = conf->eht_oper_chwidth; + if (!eht_oper_info_present) + return pos + elen; + oper->oper_params = EHT_OPER_INFO_PRESENT; seg0 = hostapd_get_oper_centr_freq_seg0_idx(conf); switch (chwidth) {