wifi: iwlwifi: nvm-parse: enable 160/320 MHz for AP mode

Initially, 160/320 MHz in AP mode were not supported.
After testing, enable the wider bandwidths in AP mode
as well.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230413102635.ed04de3a2833.Ie3991179dfaf24880b96a0904a625dbf6b8fd579@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 923bbfc..449a192 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -876,16 +876,13 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,
                                       IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK);
                break;
        case NL80211_BAND_6GHZ:
-               if (!is_ap || iwlwifi_mod_params.nvm_file)
-                       iftype_data->eht_cap.eht_cap_elem.phy_cap_info[0] |=
-                               IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;
+               iftype_data->eht_cap.eht_cap_elem.phy_cap_info[0] |=
+                       IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;
                fallthrough;
        case NL80211_BAND_5GHZ:
                iftype_data->he_cap.he_cap_elem.phy_cap_info[0] |=
-                       IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G;
-               if (!is_ap || iwlwifi_mod_params.nvm_file)
-                       iftype_data->he_cap.he_cap_elem.phy_cap_info[0] |=
-                               IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;
+                       IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
+                       IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;
                break;
        default:
                WARN_ON(1);