summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorArend van Spriel <arend.vanspriel@broadcom.com>2019-08-02 14:31:03 +0300
committerJohannes Berg <johannes.berg@intel.com>2019-08-21 11:54:35 +0300
commit0816e6b1177adb4f120767434c67441c30de10d2 (patch)
treed8c99bff2b6d1aebb8436c136e2c695e6b10eb9d /net/wireless
parente548a1c36b11ccf56627e5a2581409e2f27a6ac4 (diff)
downloadlinux-0816e6b1177adb4f120767434c67441c30de10d2.tar.xz
cfg80211: use same IR permissive rules for 6GHz band
The function cfg80211_ir_permissive_chan() is applicable for 6GHz band as well so make sure it is handled. Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> Reviewed-by: Leon Zegers <leon.zegers@broadcom.com> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> Link: https://lore.kernel.org/r/1564745465-21234-7-git-send-email-arend.vanspriel@broadcom.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/chan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 7dc1bbd0888f..7c9d204838d4 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -894,7 +894,8 @@ static bool cfg80211_ir_permissive_chan(struct wiphy *wiphy,
if (chan == other_chan)
return true;
- if (chan->band != NL80211_BAND_5GHZ)
+ if (chan->band != NL80211_BAND_5GHZ &&
+ chan->band != NL80211_BAND_6GHZ)
continue;
r1 = cfg80211_get_unii(chan->center_freq);