iwlwifi: add module parameter to disable 802.11ax

Add a module parameter to disable 802.11ax features in supported
devices.  This is useful for testing or if there are interoperability
issues with some APs.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index c59ce4f8a5edbdc2451d28f392dfbd38fba1a248..650214ff0a1cf1566df8a74482fcd750ddd7b470 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1856,3 +1856,7 @@ module_param_named(remove_when_gone,
                   0444);
 MODULE_PARM_DESC(remove_when_gone,
                 "Remove dev from PCIe bus if it is deemed inaccessible (default: false)");
+
+module_param_named(disable_11ax, iwlwifi_mod_params.disable_11ax, bool,
+                  S_IRUGO);
+MODULE_PARM_DESC(disable_11ax, "Disable HE capabilities (default: false)");

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
index a7dd8a8cddf92c0fa039fdd53466666222de61ea..5dd848cb9d206f0581d0d0fb3638ddb1767da7b6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
@@ -144,6 +144,10 @@ struct iwl_mod_params {
        bool lar_disable;
        bool fw_monitor;
        bool disable_11ac;
+       /**
+        * @disable_11ax: disable HE capabilities, default = false
+        */
+       bool disable_11ax;
        bool remove_when_gone;
 };
 

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 941604c24fa12e1e10ddcb8ab22da5600368f828..7bb0360d68075f2d5ef84823321747236f6688d2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -578,7 +578,7 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, NL80211_BAND_2GHZ,
                             tx_chains, rx_chains);
 
-       if (data->sku_cap_11ax_enable)
+       if (data->sku_cap_11ax_enable && !iwlwifi_mod_params.disable_11ax)
                iwl_init_he_hw_capab(sband, tx_chains, rx_chains);
 
        sband = &data->bands[NL80211_BAND_5GHZ];
@@ -593,7 +593,7 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
                iwl_init_vht_hw_capab(cfg, data, &sband->vht_cap,
                                      tx_chains, rx_chains);
 
-       if (data->sku_cap_11ax_enable)
+       if (data->sku_cap_11ax_enable && !iwlwifi_mod_params.disable_11ax)
                iwl_init_he_hw_capab(sband, tx_chains, rx_chains);
 
        if (n_channels != n_used)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 362e9b77974d6249840ee03bfcd60363f55cbcee..b3fd20502abb3c604352fbc9d5aa84256f40a4f6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -780,7 +780,8 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,
        if (vif->probe_req_reg && vif->bss_conf.assoc && vif->p2p)
                cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);
 
-       if (vif->bss_conf.assoc && vif->bss_conf.he_support)
+       if (vif->bss_conf.assoc && vif->bss_conf.he_support &&
+           !iwlwifi_mod_params.disable_11ax)
                cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_11AX);
 
        return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 5ad98359789bd53c25c453096fb50075f492d9fa..9779db31ab305bf868473237651074492133c67b 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -2100,7 +2100,8 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
         * added.
         */
        if (changes & BSS_CHANGED_ASSOC && bss_conf->assoc) {
-               if (vif->bss_conf.he_support)
+               if (vif->bss_conf.he_support &&
+                   !iwlwifi_mod_params.disable_11ax)
                        iwl_mvm_cfg_he_sta(mvm, vif, mvmvif->ap_sta_id);
 
                iwl_mvm_mac_ctxt_recalc_tsf_id(mvm, vif);