wifi: iwlwifi: mvm: Allow DFS concurrent operation

AX210 devices allow concurrent P2P operation on DFS channels.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Reviewed-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20231219215605.dc39b33bf507.I04dfda24d73091fb75701279d10ac400314de488@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 480f8edbfd35df97233eb09f061ac8b77c89b534..1bccbbe9a5eae2e7637f3a6f39bda0bb69c6ee9a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -1609,10 +1609,12 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan,
        /* Set the GO concurrent flag only in case that NO_IR is set.
         * Otherwise it is meaningless
         */
-       if ((nvm_flags & NVM_CHANNEL_GO_CONCURRENT) &&
-           (flags & NL80211_RRF_NO_IR))
-               flags |= NL80211_RRF_GO_CONCURRENT;
-
+       if ((nvm_flags & NVM_CHANNEL_GO_CONCURRENT)) {
+               if (flags & NL80211_RRF_NO_IR)
+                       flags |= NL80211_RRF_GO_CONCURRENT;
+               if (flags & NL80211_RRF_DFS)
+                       flags |= NL80211_RRF_DFS_CONCURRENT;
+       }
        /*
         * reg_capa is per regulatory domain so apply it for every channel
         */

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index a64600f0ed9f46eacaaadf4edb14e078530e55f5..06de4dc2a9155df75abd908c40fc4cc6b40b28ae 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -517,6 +517,10 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
                hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
                                               REGULATORY_DISABLE_BEACON_HINTS;
 
+       if (mvm->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_AX210)
+               wiphy_ext_feature_set(hw->wiphy,
+                                     NL80211_EXT_FEATURE_DFS_CONCURRENT);
+
        hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
        hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
        hw->wiphy->flags |= WIPHY_FLAG_SPLIT_SCAN_6GHZ;