Skip to content

Commit a1910a7

Browse files
aotcherejmberg-intel
authored andcommitted
wifi: iwlwifi: mvm: Allow DFS concurrent operation
AX210 devices allow concurrent P2P operation on DFS channels. Signed-off-by: Andrei Otcheretianski <[email protected]> Reviewed-by: Gregory Greenman <[email protected]> Signed-off-by: Miri Korenblit <[email protected]> Link: https://msgid.link/20231219215605.dc39b33bf507.I04dfda24d73091fb75701279d10ac400314de488@changeid Signed-off-by: Johannes Berg <[email protected]>
1 parent b1a2e5c commit a1910a7

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,10 +1609,12 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan,
16091609
/* Set the GO concurrent flag only in case that NO_IR is set.
16101610
* Otherwise it is meaningless
16111611
*/
1612-
if ((nvm_flags & NVM_CHANNEL_GO_CONCURRENT) &&
1613-
(flags & NL80211_RRF_NO_IR))
1614-
flags |= NL80211_RRF_GO_CONCURRENT;
1615-
1612+
if ((nvm_flags & NVM_CHANNEL_GO_CONCURRENT)) {
1613+
if (flags & NL80211_RRF_NO_IR)
1614+
flags |= NL80211_RRF_GO_CONCURRENT;
1615+
if (flags & NL80211_RRF_DFS)
1616+
flags |= NL80211_RRF_DFS_CONCURRENT;
1617+
}
16161618
/*
16171619
* reg_capa is per regulatory domain so apply it for every channel
16181620
*/

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,10 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
517517
hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
518518
REGULATORY_DISABLE_BEACON_HINTS;
519519

520+
if (mvm->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_AX210)
521+
wiphy_ext_feature_set(hw->wiphy,
522+
NL80211_EXT_FEATURE_DFS_CONCURRENT);
523+
520524
hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
521525
hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
522526
hw->wiphy->flags |= WIPHY_FLAG_SPLIT_SCAN_6GHZ;

0 commit comments

Comments
 (0)