stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Aloka Dixit <alokad@codeaurora.org>,
	Johannes Berg <johannes.berg@intel.com>,
	Sasha Levin <sashal@kernel.org>,
	linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 12/18] mac80211: Fix radiotap header channel flag for 6GHz band
Date: Mon, 28 Sep 2020 21:30:58 -0400	[thread overview]
Message-ID: <20200929013105.2406634-12-sashal@kernel.org> (raw)
In-Reply-To: <20200929013105.2406634-1-sashal@kernel.org>

From: Aloka Dixit <alokad@codeaurora.org>

[ 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 <alokad@codeaurora.org>
Link: https://lore.kernel.org/r/010101747ab7b703-1d7c9851-1594-43bf-81f7-f79ce7a67cc6-000000@us-west-2.amazonses.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 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 e5fb9002d3147..3ab85e1e38d82 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -419,7 +419,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


  parent reply	other threads:[~2020-09-29  1:31 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-29  1:30 [PATCH AUTOSEL 5.4 01/18] clocksource/drivers/timer-gx6605s: Fixup counter reload Sasha Levin
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 02/18] libbpf: Remove arch-specific include path in Makefile Sasha Levin
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 03/18] drivers/net/wan/hdlc_fr: Add needed_headroom for PVC devices Sasha Levin
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 04/18] drm/sun4i: mixer: Extend regmap max_register Sasha Levin
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 05/18] net: dec: de2104x: Increase receive ring size for Tulip Sasha Levin
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 06/18] rndis_host: increase sleep time in the query-response loop Sasha Levin
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 07/18] nvme-core: get/put ctrl and transport module in nvme_dev_open/release() Sasha Levin
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 08/18] regmap: debugfs: Fix handling of name string for debugfs init delays Sasha Levin
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 09/18] fuse: fix the ->direct_IO() treatment of iov_iter Sasha Levin
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 10/18] drivers/net/wan/lapbether: Make skb->protocol consistent with the header Sasha Levin
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 11/18] drivers/net/wan/hdlc: Set skb->protocol before transmitting Sasha Levin
2020-09-29  1:30 ` Sasha Levin [this message]
2020-09-29  1:30 ` [PATCH AUTOSEL 5.4 13/18] mac80211: do not allow bigger VHT MPDUs than the hardware supports Sasha Levin
2020-09-29  1:31 ` [PATCH AUTOSEL 5.4 14/18] tracing: Make the space reserved for the pid wider Sasha Levin
2020-09-29  1:31 ` [PATCH AUTOSEL 5.4 15/18] tools/io_uring: fix compile breakage Sasha Levin
2020-09-29  1:31 ` [PATCH AUTOSEL 5.4 16/18] spi: fsl-espi: Only process interrupts for expected events Sasha Levin
2020-09-29  1:31 ` [PATCH AUTOSEL 5.4 17/18] nvme-pci: fix NULL req in completion handler Sasha Levin
2020-09-29  1:31 ` [PATCH AUTOSEL 5.4 18/18] nvme-fc: fail new connections to a deleted host or remote port Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200929013105.2406634-12-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=alokad@codeaurora.org \
    --cc=johannes.berg@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).