Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3443542pxk; Mon, 28 Sep 2020 18:39:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpbVwgKJVVmORsb+QNZwfQh25Gw5BODPV5yYObQVuipWaCODQ6mZLHMqRKpJyoHMiaAlER X-Received: by 2002:a17:906:3552:: with SMTP id s18mr1520512eja.23.1601343589374; Mon, 28 Sep 2020 18:39:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601343589; cv=none; d=google.com; s=arc-20160816; b=vUwrw4sHTVjPd3bEpJgZnSFEqCqWjbJX8g92IU2eL/FXzSFqvJ3jRGhIWcraDdAHSL 4kRN95QSOfYcMsG8HAXB68TCUmDjYDh5XsGbEgUzmTUApzP7ZQD5lecVJBJQS3ZoLkSQ riQDOdyVWWA6Z2inN3fj6aIb+W6segaGD9NGk4XULtMzdB26r/So+MN/o1184OWXuNz9 FiN/TtHWN6PbEgVdZ4dke+MzSvWD45W8ikfG8jS4Ep+Mo+R8PW4mXrjgzXdoEPW3Ulcp j+ZwWLma+3vO1HW0lsrKY6KoFkGLAVeLM4HBpqDOPnpywS7U8K2TSgHIZqpFCYN3F2Er ylMg== 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=TBEwi2y5dvyHQfeNZgasxfVZemr3FvUms5bVk6aaQvs=; b=QVxQ4jZ/xmI8lr4d/DS1+si4svepFIr3ahCsblfHh/QaHwlyQP0l6ZKk3guoigsk+u HtAfDviRwivUJwIDIup9vA7pkJZurjS16aip/l4jau+kvXe+MuAM7sAyLVXyMgc71biI wCqmHcs0hXUThrlFTdvkRAuCuo1K1jrwRWMi3+0DYNIX0tkOk+rAFcle1q8JbHs/eTlU JjI6BOr5/4ofWjP1nRO37FIzvMpwsU0+eUICDFf0MEmbbsOo1y4bW70rDGqtET4Q1W7f U/xrnI6PwjPqJXIPF3sSEmxZXNGnegwYljMHflUd3in/5UC1t1EazwEouDtRYR6DtFlx O7oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IGf1Z00m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l18si1636678ejr.492.2020.09.28.18.39.18; Mon, 28 Sep 2020 18:39:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IGf1Z00m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727418AbgI2Bga (ORCPT + 99 others); Mon, 28 Sep 2020 21:36:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:39932 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726944AbgI2Bav (ORCPT ); Mon, 28 Sep 2020 21:30:51 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 87043221E8; Tue, 29 Sep 2020 01:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601343051; bh=Teh2OF51j5GQpR2E2cre2gfVUdcI0zZAKAiH2EDcWUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IGf1Z00mm6AlDf6pMULyaGH5znikdPs8mtUZOrbp3mFX23LuJs87e4YhGANxM6I4r PtwKs7kmuNHBQH3dQvRoIQt+vTL4cQtBJrssh+hUoNnwltDB1r/pi9V2KpVVdFJEnQ /IFAvviaeSk0a7dmYNNhwot4FmBX9Y1z1cGjd3mc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aloka Dixit , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 18/29] mac80211: Fix radiotap header channel flag for 6GHz band Date: Mon, 28 Sep 2020 21:30:15 -0400 Message-Id: <20200929013027.2406344-18-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200929013027.2406344-1-sashal@kernel.org> References: <20200929013027.2406344-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aloka Dixit [ Upstream commit 412a84b5714af56f3eb648bba155107b5edddfdf ] Radiotap header field 'Channel flags' has '2 GHz spectrum' set to 'true' for 6GHz packet. Change it to 5GHz as there isn't a separate option available for 6GHz. Signed-off-by: Aloka Dixit Link: https://lore.kernel.org/r/010101747ab7b703-1d7c9851-1594-43bf-81f7-f79ce7a67cc6-000000@us-west-2.amazonses.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5c5af4b5fc080..f2c3ac648fc08 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -451,7 +451,8 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, else if (status->bw == RATE_INFO_BW_5) channel_flags |= IEEE80211_CHAN_QUARTER; - if (status->band == NL80211_BAND_5GHZ) + if (status->band == NL80211_BAND_5GHZ || + status->band == NL80211_BAND_6GHZ) channel_flags |= IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ; else if (status->encoding != RX_ENC_LEGACY) channel_flags |= IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ; -- 2.25.1