Received: by 2002:a05:7412:419a:b0:f3:1519:9f41 with SMTP id i26csp4361140rdh; Tue, 28 Nov 2023 21:43:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IEHPi+cYXHEoZzaIA6FyseUbHITfHJLxKkhP2ClfwAuvgkl+1sxXlyTv/UOuJSrl2CLvTbt X-Received: by 2002:ad4:4b24:0:b0:67a:2646:8e9f with SMTP id s4-20020ad44b24000000b0067a26468e9fmr21698099qvw.26.1701236634433; Tue, 28 Nov 2023 21:43:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701236634; cv=none; d=google.com; s=arc-20160816; b=O9FFX1epe+wdbOX+w5dzubayOEtBXmCj6I+sHwqIXn5ehHl0hFD7u03bSLsdIgL15t 0hgj5JYQKu/vSq9M3NsrLhxL44q3QsxB8S4HBzE0ozPC0cRxWcCzNm6QeVIPnBRdZIX/ 2BGvby1/ppqoRGu7l5T328y2Cih8w7EoZ3XClSmqQv8JifKt8U8T2ihjEeYyf7AS3weI Am0CSbb49bL7kronjOP5BhqTTXv0RQGanJi3LbUE1O7rGCPkZxrn1Z5JoZYrfLmU3BPN Txk5zkv4WleaZtsyR942Wa6IbXW4FNQHoptMQa0XUmUyNGrC7CbOQJjuDOfv57s5w1sg C//g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3zO4qnO3aokqNTQ+ysE5ZUh/Sd2btl/qMQ8WA81MnJk=; fh=gxG7bjBNvlsUk6dcqDe8U6C50iOglV9mFWDy/aZFxUU=; b=L42YJOnelsgaORjQwlO33hJgEz2Q14VxlFCEcE/HYDRbWaOU5syNSPN0sobXRjzewY 3Ajg61bqLVPPFlPZqAudSy2jt39uEiso0XSjBRpiPJJRYEOr2FxR3NSndeBn/rw2LuAu aiGclE0QU7/8/g25DzQcXRVa7sfKsvGnULjUuu5qZrzJdo6Z26XRoRSonJKWx7gp2FC5 onPtEk9JhBFYqO2u27J7A8nl17MsupFkS+vJrDjswOGDimHIRkLo3fAFyktNVZ4qeyIn Cvy7S8MKqtx99z9yTjkkLAGLI7FVtGN65AbH5TpTdUf709QWWSArOcSV2C0puojtybls Du6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=GDeCc1hl; spf=pass (google.com: domain of linux-wireless+bounces-187-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-wireless+bounces-187-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id u5-20020ad44985000000b0067a1557eb78si10642043qvx.198.2023.11.28.21.43.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 21:43:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless+bounces-187-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=GDeCc1hl; spf=pass (google.com: domain of linux-wireless+bounces-187-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-wireless+bounces-187-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id EFAFB1C21061 for ; Wed, 29 Nov 2023 05:43:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E06486FDC; Wed, 29 Nov 2023 05:43:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="GDeCc1hl" X-Original-To: linux-wireless@vger.kernel.org Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F03DC19AB for ; Tue, 28 Nov 2023 21:43:40 -0800 (PST) X-UUID: 3cab71d08e7a11eea33bb35ae8d461a2-20231129 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=3zO4qnO3aokqNTQ+ysE5ZUh/Sd2btl/qMQ8WA81MnJk=; b=GDeCc1hl5OYzLj1AJYV/ygA5mqHKHowEcWpvCiH0N6rd/hx+EID9nUCMaCToDkwVrfGd8xklFI8ybtkf28haQfcEMrtWPsTtnodYMwVgFazY3XIbXgfBcr64GNnIVAmSLt9J7Qr50I4SYoXTce1drX6Kt7jJY4tqll/VbQFN09w=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.34,REQID:c00d147a-1ae1-4cc5-aa94-bc0b659d21ea,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:abefa75,CLOUDID:d79c9a60-c89d-4129-91cb-8ebfae4653fc,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR: NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_ULN X-UUID: 3cab71d08e7a11eea33bb35ae8d461a2-20231129 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 907144947; Wed, 29 Nov 2023 13:43:35 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs13n2.mediatek.inc (172.21.101.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 29 Nov 2023 13:43:33 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Wed, 29 Nov 2023 13:43:33 +0800 From: Michael-CY Lee To: linux-wireless CC: Johannes Berg , Felix Fietkau , Lorenzo Bianconi , Evelyn Tsai , Money Wang , linux-mediatek , Michael-CY Lee Subject: [PATCH v3,2/2] wifi: mac80211: refactor STA CSA parsing flows Date: Wed, 29 Nov 2023 13:43:21 +0800 Message-ID: <20231129054321.10199-2-michael-cy.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20231129054321.10199-1-michael-cy.lee@mediatek.com> References: <20231129054321.10199-1-michael-cy.lee@mediatek.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain The new Wi-Fi Standard (IEEE P80211be D4.1) specifies that the Wide Bandwidth Channel Switch (WBCS) Element subfields have the same definitions as VHT operation information if the operating band is not S1G. The problem comes when the BSS is in 6 GHz band, the STA parses the WBCS Element by ieee80211_chandef_vht_oper(), which checks the capabilities for HT/VHT mode, not HE/EHT mode. This patch refactors STA CSA parsing flow so that the corresponding capabilities can be checked. Also, it adds the way to use op_class in ECSA Element to build a new chandef. In summary, the new steps for STA to handle CSA event are: 1. build the new chandef from the CSA-related Elements. (CSA, ECSA, WBCS, etc.) 2. convert the new chandef into operation information according to the operating band in order to check if the new chandef fits STA's capabilities. 3. downgrade the bandwidth until current bandwidth is not disabled. Signed-off-by: Michael-CY Lee Signed-off-by: Money Wang --- v3: Version 2 follows draft 3.2, while version 3 follows draft 4.1. Also, version 3 simplifies the CSA handling steps. --- net/mac80211/spectmgmt.c | 349 +++++++++++++++++++++++++++++++++------ 1 file changed, 294 insertions(+), 55 deletions(-) diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c index 55959b0b24c5..9a5f743ee750 100644 --- a/net/mac80211/spectmgmt.c +++ b/net/mac80211/spectmgmt.c @@ -19,6 +19,236 @@ #include "sta_info.h" #include "wme.h" +static inline void +wbcs_ie_to_chandef(const struct ieee80211_wide_bw_chansw_ie *wbcs_ie, + struct cfg80211_chan_def *chandef) +{ + u8 ccfs0 = wbcs_ie->new_center_freq_seg0; + u8 ccfs1 = wbcs_ie->new_center_freq_seg1; + u32 cf0 = ieee80211_channel_to_frequency(ccfs0, chandef->chan->band); + u32 cf1 = ieee80211_channel_to_frequency(ccfs1, chandef->chan->band); + + switch (wbcs_ie->new_channel_width) { + case IEEE80211_VHT_CHANWIDTH_160MHZ: + chandef->width = NL80211_CHAN_WIDTH_160; + chandef->center_freq1 = cf0; + break; + case IEEE80211_VHT_CHANWIDTH_80P80MHZ: + chandef->width = NL80211_CHAN_WIDTH_80P80; + chandef->center_freq1 = cf0; + chandef->center_freq2 = cf1; + break; + case IEEE80211_VHT_CHANWIDTH_80MHZ: + chandef->width = NL80211_CHAN_WIDTH_80; + chandef->center_freq1 = cf0; + + if (ccfs1) { + u8 diff = abs(ccfs0 - ccfs1); + + if (diff == 8) { + chandef->width = NL80211_CHAN_WIDTH_160; + chandef->center_freq1 = cf1; + } else if (diff > 8) { + chandef->width = NL80211_CHAN_WIDTH_80P80; + chandef->center_freq2 = cf1; + } + } + break; + case IEEE80211_VHT_CHANWIDTH_USE_HT: + default: + /* If the WBCS Element is present, new channel bandwidth is + * at least 40 MHz. + */ + chandef->width = NL80211_CHAN_WIDTH_40; + chandef->center_freq1 = cf0; + break; + } +} + +static inline int +validate_chandef_by_ht_vht_oper(struct ieee80211_sub_if_data *sdata, + ieee80211_conn_flags_t conn_flags, + u32 vht_cap_info, + struct cfg80211_chan_def *chandef) +{ + u32 control_freq, center_freq1, center_freq2; + enum nl80211_chan_width chan_width; + struct ieee80211_ht_operation *ht_oper = NULL; + struct ieee80211_vht_operation *vht_oper = NULL; + + if (conn_flags & (IEEE80211_CONN_DISABLE_HT | + IEEE80211_CONN_DISABLE_40MHZ)) { + chandef->chan = NULL; + return 0; + } + + control_freq = chandef->chan->center_freq; + center_freq1 = chandef->center_freq1; + center_freq2 = chandef->center_freq2; + chan_width = chandef->width; + + ht_oper = kzalloc(sizeof(*ht_oper), GFP_KERNEL); + if (!ht_oper) + return -ENOMEM; + + ht_oper->primary_chan = ieee80211_frequency_to_channel(control_freq); + if (control_freq != center_freq1) + ht_oper->ht_param = control_freq > center_freq1 ? + IEEE80211_HT_PARAM_CHA_SEC_BELOW : + IEEE80211_HT_PARAM_CHA_SEC_ABOVE; + else + ht_oper->ht_param = IEEE80211_HT_PARAM_CHA_SEC_NONE; + + ieee80211_chandef_ht_oper(ht_oper, chandef); + + if (conn_flags & IEEE80211_CONN_DISABLE_VHT) { + kfree(ht_oper); + return 0; + } + + vht_oper = kzalloc(sizeof(*vht_oper), GFP_KERNEL); + if (!vht_oper) { + kfree(ht_oper); + return -ENOMEM; + } + + vht_oper->center_freq_seg0_idx = + ieee80211_frequency_to_channel(center_freq1); + vht_oper->center_freq_seg1_idx = center_freq2 ? + ieee80211_frequency_to_channel(center_freq2) : 0; + + switch (chan_width) { + case NL80211_CHAN_WIDTH_320: + WARN_ON(1); + break; + case NL80211_CHAN_WIDTH_160: + vht_oper->chan_width = IEEE80211_VHT_CHANWIDTH_80MHZ; + vht_oper->center_freq_seg1_idx = vht_oper->center_freq_seg0_idx; + vht_oper->center_freq_seg0_idx += + control_freq < center_freq1 ? -8 : 8; + break; + case NL80211_CHAN_WIDTH_80P80: + vht_oper->chan_width = IEEE80211_VHT_CHANWIDTH_80MHZ; + break; + case NL80211_CHAN_WIDTH_80: + vht_oper->chan_width = IEEE80211_VHT_CHANWIDTH_80MHZ; + break; + default: + vht_oper->chan_width = IEEE80211_VHT_CHANWIDTH_USE_HT; + break; + } + + ht_oper->operation_mode = + cpu_to_le16(vht_oper->center_freq_seg1_idx << + IEEE80211_HT_OP_MODE_CCFS2_SHIFT); + + if (!ieee80211_chandef_vht_oper(&sdata->local->hw, vht_cap_info, + vht_oper, ht_oper, chandef)) + chandef->chan = NULL; + + kfree(ht_oper); + kfree(vht_oper); + + return 0; +} + +static inline int +validate_chandef_by_6ghz_he_eht_oper(struct ieee80211_sub_if_data *sdata, + ieee80211_conn_flags_t conn_flags, + struct cfg80211_chan_def *chandef) +{ + u32 size, control_freq, center_freq1, center_freq2; + enum nl80211_chan_width chan_width; + struct ieee80211_he_operation *he_oper = NULL; + struct ieee80211_he_6ghz_oper *he_6ghz_oper; + struct ieee80211_eht_operation *eht_oper = NULL; + struct ieee80211_eht_operation_info *eht_oper_info; + + if (conn_flags & (IEEE80211_CONN_DISABLE_HE)) { + chandef->chan = NULL; + return 0; + } + + control_freq = chandef->chan->center_freq; + center_freq1 = chandef->center_freq1; + center_freq2 = chandef->center_freq2; + chan_width = chandef->width; + + size = sizeof(struct ieee80211_he_operation) + + sizeof(struct ieee80211_he_6ghz_oper); + + he_oper = kzalloc(size, GFP_KERNEL); + if (!he_oper) + return -ENOMEM; + + if (!(conn_flags & IEEE80211_CONN_DISABLE_EHT)) { + size = sizeof(struct ieee80211_eht_operation) + + sizeof(struct ieee80211_eht_operation_info); + + eht_oper = kzalloc(size, GFP_KERNEL); + if (!eht_oper) { + kfree(he_oper); + return -ENOMEM; + } + } + + he_oper->he_oper_params = cpu_to_le32(u32_encode_bits(1, + IEEE80211_HE_OPERATION_6GHZ_OP_INFO)); + + he_6ghz_oper = (struct ieee80211_he_6ghz_oper *)he_oper->optional; + he_6ghz_oper->primary = + ieee80211_frequency_to_channel(control_freq); + he_6ghz_oper->ccfs0 = ieee80211_frequency_to_channel(center_freq1); + he_6ghz_oper->ccfs1 = center_freq2 ? + ieee80211_frequency_to_channel(center_freq2) : 0; + + switch (chan_width) { + case NL80211_CHAN_WIDTH_320: + he_6ghz_oper->ccfs1 = he_6ghz_oper->ccfs0; + he_6ghz_oper->ccfs0 += control_freq < center_freq1 ? -16 : 16; + he_6ghz_oper->control = IEEE80211_EHT_OPER_CHAN_WIDTH_320MHZ; + break; + case NL80211_CHAN_WIDTH_160: + he_6ghz_oper->ccfs1 = he_6ghz_oper->ccfs0; + he_6ghz_oper->ccfs0 += control_freq < center_freq1 ? -8 : 8; + fallthrough; + case NL80211_CHAN_WIDTH_80P80: + he_6ghz_oper->control = + IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_160MHZ; + break; + case NL80211_CHAN_WIDTH_80: + he_6ghz_oper->control = + IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_80MHZ; + break; + case NL80211_CHAN_WIDTH_40: + he_6ghz_oper->control = + IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_40MHZ; + break; + default: + he_6ghz_oper->control = + IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_20MHZ; + break; + } + + if (eht_oper) { + eht_oper->params = IEEE80211_EHT_OPER_INFO_PRESENT; + + eht_oper_info = + (struct ieee80211_eht_operation_info *)eht_oper->optional; + eht_oper_info->control = he_6ghz_oper->control; + eht_oper_info->ccfs0 = he_6ghz_oper->ccfs0; + eht_oper_info->ccfs1 = he_6ghz_oper->ccfs1; + } + + if (!ieee80211_chandef_he_6ghz_oper(sdata, he_oper, eht_oper, chandef)) + chandef->chan = NULL; + + kfree(he_oper); + kfree(eht_oper); + + return 0; +} + int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, struct ieee802_11_elems *elems, enum nl80211_band current_band, @@ -27,13 +257,14 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, struct ieee80211_csa_ie *csa_ie) { enum nl80211_band new_band = current_band; - int new_freq; - u8 new_chan_no; + int new_freq, ret; + u8 new_chan_no = 0, new_op_class = 0; struct ieee80211_channel *new_chan; - struct cfg80211_chan_def new_vht_chandef = {}; + struct cfg80211_chan_def new_chandef = {}; const struct ieee80211_sec_chan_offs_ie *sec_chan_offs; const struct ieee80211_wide_bw_chansw_ie *wide_bw_chansw_ie; const struct ieee80211_bandwidth_indication *bwi; + const struct ieee80211_ext_chansw_ie *ext_chansw_ie; int secondary_channel_offset = -1; memset(csa_ie, 0, sizeof(*csa_ie)); @@ -41,6 +272,7 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, sec_chan_offs = elems->sec_chan_offs; wide_bw_chansw_ie = elems->wide_bw_chansw_ie; bwi = elems->bandwidth_indication; + ext_chansw_ie = elems->ext_chansw_ie; if (conn_flags & (IEEE80211_CONN_DISABLE_HT | IEEE80211_CONN_DISABLE_40MHZ)) { @@ -51,26 +283,30 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, if (conn_flags & IEEE80211_CONN_DISABLE_VHT) wide_bw_chansw_ie = NULL; - if (elems->ext_chansw_ie) { - if (!ieee80211_operating_class_to_band( - elems->ext_chansw_ie->new_operating_class, - &new_band)) { - sdata_info(sdata, - "cannot understand ECSA IE operating class, %d, ignoring\n", - elems->ext_chansw_ie->new_operating_class); + if (ext_chansw_ie) { + new_op_class = ext_chansw_ie->new_operating_class; + if (!ieee80211_operating_class_to_band(new_op_class, &new_band)) { + new_op_class = 0; + sdata_info(sdata, "cannot understand ECSA IE " + "operating class, %d, ignoring\n", + ext_chansw_ie->new_operating_class); + } else { + new_chan_no = ext_chansw_ie->new_ch_num; + csa_ie->count = ext_chansw_ie->count; + csa_ie->mode = ext_chansw_ie->mode; } - new_chan_no = elems->ext_chansw_ie->new_ch_num; - csa_ie->count = elems->ext_chansw_ie->count; - csa_ie->mode = elems->ext_chansw_ie->mode; - } else if (elems->ch_switch_ie) { + } + + if (!new_op_class && elems->ch_switch_ie) { new_chan_no = elems->ch_switch_ie->new_ch_num; csa_ie->count = elems->ch_switch_ie->count; csa_ie->mode = elems->ch_switch_ie->mode; - } else { - /* nothing here we understand */ - return 1; } + /* nothing here we understand */ + if (!new_chan_no) + return 1; + /* Mesh Channel Switch Parameters Element */ if (elems->mesh_chansw_params_ie) { csa_ie->ttl = elems->mesh_chansw_params_ie->mesh_ttl; @@ -134,65 +370,68 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, break; } + /* parse one of the Elements to build a new chandef */ + memset(&new_chandef, 0, sizeof(new_chandef)); + new_chandef.chan = new_chan; if (bwi) { /* start with the CSA one */ - new_vht_chandef = csa_ie->chandef; + new_chandef = csa_ie->chandef; /* and update the width accordingly */ /* FIXME: support 160/320 */ ieee80211_chandef_eht_oper(&bwi->info, true, true, - &new_vht_chandef); - } else if (wide_bw_chansw_ie) { - u8 new_seg1 = wide_bw_chansw_ie->new_center_freq_seg1; - struct ieee80211_vht_operation vht_oper = { - .chan_width = - wide_bw_chansw_ie->new_channel_width, - .center_freq_seg0_idx = - wide_bw_chansw_ie->new_center_freq_seg0, - .center_freq_seg1_idx = new_seg1, - /* .basic_mcs_set doesn't matter */ - }; - struct ieee80211_ht_operation ht_oper = { - .operation_mode = - cpu_to_le16(new_seg1 << - IEEE80211_HT_OP_MODE_CCFS2_SHIFT), - }; - - /* default, for the case of IEEE80211_VHT_CHANWIDTH_USE_HT, - * to the previously parsed chandef - */ - new_vht_chandef = csa_ie->chandef; + &new_chandef); + } else if (!ieee80211_operating_class_to_chandef(new_op_class, new_chan, + &new_chandef)) { + if (wide_bw_chansw_ie) + wbcs_ie_to_chandef(wide_bw_chansw_ie, &new_chandef); + else + new_chandef = csa_ie->chandef; + } + + if (!cfg80211_chandef_valid(&new_chandef)) + new_chandef = csa_ie->chandef; - /* ignore if parsing fails */ - if (!ieee80211_chandef_vht_oper(&sdata->local->hw, - vht_cap_info, - &vht_oper, &ht_oper, - &new_vht_chandef)) - new_vht_chandef.chan = NULL; + /* check if the new chandef fits the capabilities */ + if (new_band == NL80211_BAND_6GHZ) { + ret = validate_chandef_by_6ghz_he_eht_oper(sdata, conn_flags, + &new_chandef); + if (ret) + return ret; + } else { + ret = validate_chandef_by_ht_vht_oper(sdata, conn_flags, + vht_cap_info, &new_chandef); + if (ret) + return ret; + } + + /* if data is there validate the bandwidth & use it */ + if (new_chandef.chan) { + if (conn_flags & IEEE80211_CONN_DISABLE_320MHZ && + new_chandef.width == NL80211_CHAN_WIDTH_320) + ieee80211_chandef_downgrade(&new_chandef); if (conn_flags & IEEE80211_CONN_DISABLE_80P80MHZ && - new_vht_chandef.width == NL80211_CHAN_WIDTH_80P80) - ieee80211_chandef_downgrade(&new_vht_chandef); + new_chandef.width == NL80211_CHAN_WIDTH_80P80) + ieee80211_chandef_downgrade(&new_chandef); + if (conn_flags & IEEE80211_CONN_DISABLE_160MHZ && - new_vht_chandef.width == NL80211_CHAN_WIDTH_160) - ieee80211_chandef_downgrade(&new_vht_chandef); - } + new_chandef.width == NL80211_CHAN_WIDTH_160) + ieee80211_chandef_downgrade(&new_chandef); - /* if VHT data is there validate & use it */ - if (new_vht_chandef.chan) { - if (!cfg80211_chandef_compatible(&new_vht_chandef, + if (!cfg80211_chandef_compatible(&new_chandef, &csa_ie->chandef)) { sdata_info(sdata, "BSS %pM: CSA has inconsistent channel data, disconnecting\n", bssid); return -EINVAL; } - csa_ie->chandef = new_vht_chandef; + csa_ie->chandef = new_chandef; } if (elems->max_channel_switch_time) csa_ie->max_switch_time = (elems->max_channel_switch_time[0] << 0) | - (elems->max_channel_switch_time[1] << 8) | + (elems->max_channel_switch_time[1] << 8) | (elems->max_channel_switch_time[2] << 16); return 0; -- 2.25.1