wifi: mac80211_hwsim: Add 160MHz bw range to regdom_custom_04

This allows testing 160MHz channels with DFS concurrent.
While at it, remove the TODO for adding a module param to enable
NL80211_EXT_FEATURE_DFS_CONCURRENT. This is not really needed as
mac80211_hwsim still needs to be loaded with custom regdom.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240206164849.1b9955e511f0.I5e5315e3a047db3677bfb5ead003a3a4f7d29b13@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/virtual/mac80211_hwsim.c b/drivers/net/wireless/virtual/mac80211_hwsim.c
index c337afd8bee22bd55306d259c47d25332483ca17..0554946ed30e6d7b705c978742555d30b49897ad 100644 (file)
--- a/drivers/net/wireless/virtual/mac80211_hwsim.c
+++ b/drivers/net/wireless/virtual/mac80211_hwsim.c
@@ -196,8 +196,11 @@ static const struct ieee80211_regdomain hwsim_world_regdom_custom_04 = {
        .reg_rules = {
                REG_RULE(2412 - 10, 2462 + 10, 40, 0, 20, 0),
                REG_RULE(2484 - 10, 2484 + 10, 40, 0, 20, 0),
-               REG_RULE(5150 - 10, 5240 + 10, 80, 0, 30, 0),
+               REG_RULE(5150 - 10, 5240 + 10, 80, 0, 30, NL80211_RRF_AUTO_BW),
                REG_RULE(5260 - 10, 5320 + 10, 80, 0, 30,
+                        NL80211_RRF_DFS_CONCURRENT | NL80211_RRF_DFS |
+                        NL80211_RRF_AUTO_BW),
+               REG_RULE(5500 - 10, 5720 + 10, 160, 0, 30,
                         NL80211_RRF_DFS_CONCURRENT | NL80211_RRF_DFS),
                REG_RULE(5745 - 10, 5825 + 10, 80, 0, 30, 0),
                REG_RULE(5855 - 10, 5925 + 10, 80, 0, 33, 0),
@@ -5390,7 +5393,6 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
                schedule_timeout_interruptible(1);
        }
 
-       /* TODO: Add param */
        wiphy_ext_feature_set(hw->wiphy,
                              NL80211_EXT_FEATURE_DFS_CONCURRENT);