|
 |
deb259 |
From b51d74dc1f62cae3bbc1ac9549bcf0a958d44847 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 25 Jul 2019 14:51:22 +0200
|
|
|
deb259 |
Subject: [PATCH 3/3] Revert "iwlwifi: mvm: advertise support for TWT in the
|
|
|
deb259 |
Extended Capability IE"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 7360f99e0b99e325ae945eb39a3407215403d4d2.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 ++-
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 22 ----------------------
|
|
|
deb259 |
2 files changed, 2 insertions(+), 23 deletions(-)
|
|
|
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-07-25 13:58:41.795295113 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2019-07-25 14:52:20.098505819 +0200
|
|
|
deb259 |
@@ -587,7 +587,8 @@
|
|
|
deb259 |
.has_he = true,
|
|
|
deb259 |
.he_cap_elem = {
|
|
|
deb259 |
.mac_cap_info[0] =
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP0_HTC_HE,
|
|
|
deb259 |
+ IEEE80211_HE_MAC_CAP0_HTC_HE |
|
|
|
deb259 |
+ IEEE80211_HE_MAC_CAP0_TWT_RES,
|
|
|
deb259 |
.mac_cap_info[1] =
|
|
|
deb259 |
IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |
|
|
|
deb259 |
IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 2019-07-25 14:52:10.765633766 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 2019-07-25 14:52:20.099505805 +0200
|
|
|
deb259 |
@@ -395,21 +395,6 @@
|
|
|
deb259 |
return ret;
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
-const static u8 he_if_types_ext_capa_sta[] = {
|
|
|
deb259 |
- [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,
|
|
|
deb259 |
- [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,
|
|
|
deb259 |
- [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT,
|
|
|
deb259 |
-};
|
|
|
deb259 |
-
|
|
|
deb259 |
-const static struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = {
|
|
|
deb259 |
- {
|
|
|
deb259 |
- .iftype = NL80211_IFTYPE_STATION,
|
|
|
deb259 |
- .extended_capabilities = he_if_types_ext_capa_sta,
|
|
|
deb259 |
- .extended_capabilities_mask = he_if_types_ext_capa_sta,
|
|
|
deb259 |
- .extended_capabilities_len = sizeof(he_if_types_ext_capa_sta),
|
|
|
deb259 |
- },
|
|
|
deb259 |
-};
|
|
|
deb259 |
-
|
|
|
deb259 |
int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
|
|
|
deb259 |
{
|
|
|
deb259 |
struct ieee80211_hw *hw = mvm->hw;
|
|
|
deb259 |
@@ -700,13 +685,6 @@
|
|
|
deb259 |
NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE);
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
- if (mvm->nvm_data->sku_cap_11ax_enable &&
|
|
|
deb259 |
- !iwlwifi_mod_params.disable_11ax) {
|
|
|
deb259 |
- hw->wiphy->iftype_ext_capab = he_iftypes_ext_capa;
|
|
|
deb259 |
- hw->wiphy->num_iftype_ext_capab =
|
|
|
deb259 |
- ARRAY_SIZE(he_iftypes_ext_capa);
|
|
|
deb259 |
- }
|
|
|
deb259 |
-
|
|
|
deb259 |
mvm->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
|
|
|
deb259 |
|
|
|
deb259 |
#ifdef CONFIG_PM_SLEEP
|