|
 |
deb259 |
From f3623b10c8d9adac4a7e777a05972c934ac50560 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 16:15:33 +0200
|
|
|
deb259 |
Subject: [PATCH 02/43] Revert "iwlwifi: add module parameter to disable
|
|
|
deb259 |
802.11ax"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 230ba6c5a9df33bbd6ad5980a3f8dc446c3e881f.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 ----
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 4 ----
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 4 ++--
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 3 +--
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +--
|
|
|
deb259 |
5 files changed, 4 insertions(+), 14 deletions(-)
|
|
|
deb259 |
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2019-06-27 14:54:04.129678386 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2019-09-06 01:25:40.743352688 +0200
|
|
|
deb259 |
@@ -1860,7 +1860,3 @@
|
|
|
deb259 |
0444);
|
|
|
deb259 |
MODULE_PARM_DESC(remove_when_gone,
|
|
|
deb259 |
"Remove dev from PCIe bus if it is deemed inaccessible (default: false)");
|
|
|
deb259 |
-
|
|
|
deb259 |
-module_param_named(disable_11ax, iwlwifi_mod_params.disable_11ax, bool,
|
|
|
deb259 |
- S_IRUGO);
|
|
|
deb259 |
-MODULE_PARM_DESC(disable_11ax, "Disable HE capabilities (default: false)");
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h 2019-06-27 14:54:04.130678374 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h 2019-09-06 01:25:40.743352688 +0200
|
|
|
deb259 |
@@ -144,10 +144,6 @@
|
|
|
deb259 |
bool lar_disable;
|
|
|
deb259 |
bool fw_monitor;
|
|
|
deb259 |
bool disable_11ac;
|
|
|
deb259 |
- /**
|
|
|
deb259 |
- * @disable_11ax: disable HE capabilities, default = false
|
|
|
deb259 |
- */
|
|
|
deb259 |
- bool disable_11ax;
|
|
|
deb259 |
bool remove_when_gone;
|
|
|
deb259 |
bool enable_ini;
|
|
|
deb259 |
};
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2019-09-06 01:25:40.500355788 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2019-09-06 01:25:40.744352675 +0200
|
|
|
deb259 |
@@ -595,7 +595,7 @@
|
|
|
deb259 |
iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, NL80211_BAND_2GHZ,
|
|
|
deb259 |
tx_chains, rx_chains);
|
|
|
deb259 |
|
|
|
deb259 |
- if (data->sku_cap_11ax_enable && !iwlwifi_mod_params.disable_11ax)
|
|
|
deb259 |
+ if (data->sku_cap_11ax_enable)
|
|
|
deb259 |
iwl_init_he_hw_capab(sband, tx_chains, rx_chains);
|
|
|
deb259 |
|
|
|
deb259 |
sband = &data->bands[NL80211_BAND_5GHZ];
|
|
|
deb259 |
@@ -610,7 +610,7 @@
|
|
|
deb259 |
iwl_init_vht_hw_capab(cfg, data, &sband->vht_cap,
|
|
|
deb259 |
tx_chains, rx_chains);
|
|
|
deb259 |
|
|
|
deb259 |
- if (data->sku_cap_11ax_enable && !iwlwifi_mod_params.disable_11ax)
|
|
|
deb259 |
+ if (data->sku_cap_11ax_enable)
|
|
|
deb259 |
iwl_init_he_hw_capab(sband, tx_chains, rx_chains);
|
|
|
deb259 |
|
|
|
deb259 |
if (n_channels != n_used)
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c 2019-09-05 14:40:03.330474856 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c 2019-09-06 01:25:40.745352663 +0200
|
|
|
deb259 |
@@ -776,8 +776,7 @@
|
|
|
deb259 |
if (vif->probe_req_reg && vif->bss_conf.assoc && vif->p2p)
|
|
|
deb259 |
cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);
|
|
|
deb259 |
|
|
|
deb259 |
- if (vif->bss_conf.assoc && vif->bss_conf.he_support &&
|
|
|
deb259 |
- !iwlwifi_mod_params.disable_11ax) {
|
|
|
deb259 |
+ if (vif->bss_conf.assoc && vif->bss_conf.he_support)
|
|
|
deb259 |
cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_11AX);
|
|
|
deb259 |
if (vif->bss_conf.twt_requester)
|
|
|
deb259 |
ctxt_sta->data_policy |= cpu_to_le32(TWT_SUPPORTED);
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 2019-09-06 01:25:40.501355775 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 2019-09-06 01:25:40.745352663 +0200
|
|
|
deb259 |
@@ -2258,8 +2258,7 @@
|
|
|
deb259 |
* added.
|
|
|
deb259 |
*/
|
|
|
deb259 |
if (changes & BSS_CHANGED_ASSOC && bss_conf->assoc) {
|
|
|
deb259 |
- if (vif->bss_conf.he_support &&
|
|
|
deb259 |
- !iwlwifi_mod_params.disable_11ax)
|
|
|
deb259 |
+ if (vif->bss_conf.he_support)
|
|
|
deb259 |
iwl_mvm_cfg_he_sta(mvm, vif, mvmvif->ap_sta_id);
|
|
|
deb259 |
|
|
|
deb259 |
iwl_mvm_mac_ctxt_recalc_tsf_id(mvm, vif);
|