From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51B89C4167B for ; Mon, 4 Dec 2023 20:34:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346374AbjLDUe3 (ORCPT ); Mon, 4 Dec 2023 15:34:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346274AbjLDUd6 (ORCPT ); Mon, 4 Dec 2023 15:33:58 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A44651730 for ; Mon, 4 Dec 2023 12:33:51 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5665EC433CA; Mon, 4 Dec 2023 20:33:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701722031; bh=DTxZoB2ijV4doze7pSVvhYFhN5o4AoNCW2lMhnZll+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=htamEAZIc0+sIzhVswMJg7VNY18YUYYQyrOhEjp3tTT5gdxkVvWOl8W3fMkKgVSMF tDKxhxTiVQw4gtU/AmMU5s5v1C/rYml5EqlutaJdGyoefXRHTMDK7m01NhCc7IT27g fE//Gin1uesQMx/+/pIlLPcYFW4rKD1BHOkv0KkNpTlfQs8KwnzFa/ZCmruNdSUman /YLyjY7zWHgQkJRpU3Pg4z6BkZdWPnNtMz2lTvBb70zwu0PpPy+Ck+00CL7x1F0GA4 SXhMQ7BIMcInlNol2OpvIxHfxBofA9X75BXRkea3El2JD2yAuVtKabodO19iZusp84 S46AsY2XzpWZQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ben Greear , Johannes Berg , Sasha Levin , johannes@sipsolutions.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 13/32] wifi: mac80211: handle 320 MHz in ieee80211_ht_cap_ie_to_sta_ht_cap Date: Mon, 4 Dec 2023 15:32:33 -0500 Message-ID: <20231204203317.2092321-13-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204203317.2092321-1-sashal@kernel.org> References: <20231204203317.2092321-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.4 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Greear [ Upstream commit 00f7d153f3358a7c7e35aef66fcd9ceb95d90430 ] The new 320 MHz channel width wasn't handled, so connecting a station to a 320 MHz AP would limit the station to 20 MHz (on HT) after a warning, handle 320 MHz to fix that. Signed-off-by: Ben Greear Link: https://lore.kernel.org/r/20231109182201.495381-1-greearb@candelatech.com [write a proper commit message] Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/ht.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index 33729870ad8a3..b3371872895cc 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -271,6 +271,7 @@ bool ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_sub_if_data *sdata, case NL80211_CHAN_WIDTH_80: case NL80211_CHAN_WIDTH_80P80: case NL80211_CHAN_WIDTH_160: + case NL80211_CHAN_WIDTH_320: bw = ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ? IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20; break; -- 2.42.0