[5.15,17/25] iwlwifi: dont advertise TWT support

Message ID	20220317124526.800881022@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Golan Ben Ami <golan.ben.ami@intel.com>, Luca Coelho <luciano.coelho@intel.com>, Johannes Berg <johannes.berg@intel.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.15 17/25] iwlwifi: dont advertise TWT support Date: Thu, 17 Mar 2022 13:46:04 +0100 Message-Id: <20220317124526.800881022@linuxfoundation.org> In-Reply-To: <20220317124526.308079100@linuxfoundation.org> References: <20220317124526.308079100@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.15,02/25] arm64: dts: rockchip: fix rk3399-puma-haikou USB OTG mode [5.15,03/25] xfrm: Check if_id in xfrm_migrate [5.15,05/25] arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity [5.15,06/25] arm64: dts: rockchip: align pl330 node name with dtschema [5.15,07/25] arm64: dts: rockchip: reorder rk3399 hdmi clocks [5.15,08/25] arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg" [5.15,09/25] ARM: dts: rockchip: reorder rk322x hmdi clocks [5.15,10/25] ARM: dts: rockchip: fix a typo on rk3288 crypto-controller [5.15,11/25] mac80211: refuse aggregations sessions before authorized [5.15,12/25] MIPS: smp: fill in sibling and core maps earlier [5.15,15/25] can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready [5.15,16/25] atm: firestream: check the return value of ioremap() in fs_init() [5.15,17/25] iwlwifi: dont advertise TWT support [5.15,20/25] tcp: make tcp_read_sock() more robust [5.15,21/25] sfc: extend the locking on mcdi->seqno [5.15,23/25] kselftest/vm: fix tests build with old libc [5.15,24/25] x86/module: Fix the paravirt vs alternative order [5.15,25/25] ice: Fix race condition during interface enslave

Message ID

20220317124526.800881022@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        stable@vger.kernel.org, Golan Ben Ami <golan.ben.ami@intel.com>,
        Luca Coelho <luciano.coelho@intel.com>,
        Johannes Berg <johannes.berg@intel.com>,
        Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.15 17/25] iwlwifi: dont advertise TWT support
Date: Thu, 17 Mar 2022 13:46:04 +0100
Message-Id: <20220317124526.800881022@linuxfoundation.org>
In-Reply-To: <20220317124526.308079100@linuxfoundation.org>
References: <20220317124526.308079100@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg Kroah-Hartman March 17, 2022, 12:46 p.m. UTC

From: Golan Ben Ami <golan.ben.ami@intel.com>

[ Upstream commit 1db5fcbba2631277b78d7f8aff99c9607d29f6d8 ]

Some APs misbehave when TWT is used and cause our firmware to crash.
We don't know a reasonable way to detect and work around this problem
in the FW yet.  To prevent these crashes, disable TWT in the driver by
stopping to advertise TWT support.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=215523
Signed-off-by: Golan Ben Ami <golan.ben.ami@intel.com>
[reworded the commit message]
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/20220301072926.153969-1-luca@coelho.fi
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 +--
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 475f951d4b1e..fc40cca096c2 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -541,8 +541,7 @@  static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {
 			.has_he = true,
 			.he_cap_elem = {
 				.mac_cap_info[0] =
-					IEEE80211_HE_MAC_CAP0_HTC_HE |
-					IEEE80211_HE_MAC_CAP0_TWT_REQ,
+					IEEE80211_HE_MAC_CAP0_HTC_HE,
 				.mac_cap_info[1] =
 					IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |
 					IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 750217393f48..56c7a68a6491 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -295,7 +295,6 @@  static const u8 he_if_types_ext_capa_sta[] = {
 	 [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,
 	 [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,
 	 [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,
-	 [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT,
 };
 
 static const struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = {

[5.15,17/25] iwlwifi: dont advertise TWT support

Commit Message

Patch