aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAloka Dixit <alokad@codeaurora.org>2020-09-11 01:11:35 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-07 08:01:26 +0200
commit355a710f0813458456d5e7b79aa3b106a74bd900 (patch)
tree1c19c62ab90b0ab4668dd86e27ade59576de3d2f
parentdrivers/net/wan/hdlc: Set skb->protocol before transmitting (diff)
downloadwireguard-linux-355a710f0813458456d5e7b79aa3b106a74bd900.tar.xz
wireguard-linux-355a710f0813458456d5e7b79aa3b106a74bd900.zip
mac80211: Fix radiotap header channel flag for 6GHz band
[ 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>
-rw-r--r--net/mac80211/rx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index e5fb9002d314..3ab85e1e38d8 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;