cfg80211: use same IR permissive rules for 6GHz band
authorArend van Spriel <arend.vanspriel@broadcom.com>
Fri, 2 Aug 2019 11:31:03 +0000 (13:31 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 21 Aug 2019 08:54:35 +0000 (10:54 +0200)
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>
net/wireless/chan.c

index 7dc1bbd0888fffee2cb70acfc10300a12ec9e933..7c9d204838d4c708796e72bbb28ae0ea4181197d 100644 (file)
@@ -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);