Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp256322ybz; Fri, 17 Apr 2020 00:11:56 -0700 (PDT) X-Google-Smtp-Source: APiQypIj59ZLwiH9oruAAysJnq0bs/gPqTjGA4loBkuEbTSZl6Crq27aZ8//9FGhxXPXM8jjm6QB X-Received: by 2002:aa7:ce8e:: with SMTP id y14mr1671794edv.30.1587107516566; Fri, 17 Apr 2020 00:11:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587107516; cv=none; d=google.com; s=arc-20160816; b=GMwVLfStwzrBnwk8LFVykR9bj27ucsFVN+w6ugC0JeCmyCY0f/RB6yTDqmIOecLhQ1 VXlLikiimlqwuo/QmQOvoxlD49mVhZd5goUpCPIhEfn0VUhAlEdFovnZJY0HXmPvTzgS lcAG84SYALNJN7hMAWFTWWWpDvR1+fdpYDux11o/Va4ER1NGECoLb8F4Q3Kyw+jnO1Th +TDBBK+Ussc6ZaJQ8cDo8OGG3vup7nF57YYbeVm9FnGC2Nfj0727yqWM/mVSXs8Twf2r 9PEZMt5aVud+JefvYmrRlDDcj0Z8oN6Lfi+hxZSLqv4bJwq6vF+Zd+rROhTGJzWoNs/u FcfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:subject:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:cc:to:from; bh=y8x/+mGtukATPyJTqXEMb2Ttn6M06U7xS8duEPaX/VY=; b=DPGgJjV32TbFfldP64NQ+5+P/HZ1I/tylL4objt31DMVM6CtOdXcE7QplsV11TEyql 2ZPYPgv1LeCg/L2xj+vgYKtnY8fCV03KzxCztXyOjutN3BZsWeQSsxKAQdHLDcs5Ed0h eswtmbexU7ksfEg+gSK/YMTxbMlZZ3y9qUeVNcy3iSXC5lEdRFCA6h2PDHDmG2OekPqY Rg45Xun1KbB8bBrP6iwaT/PYsU96FTN2s1lkhC+DpyZi0vC8SU4m8BcOrMhp2JF9Rm0E 3Tsfan2LbWOVzk1Q9OK73b8LA2WWQVpY5yRmj05sZgrq60aOulTzV3k7N/1TT/TlqLKe nQ0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u12si6931943edb.262.2020.04.17.00.11.32; Fri, 17 Apr 2020 00:11:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728768AbgDQHI3 (ORCPT + 99 others); Fri, 17 Apr 2020 03:08:29 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:56394 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728738AbgDQHI2 (ORCPT ); Fri, 17 Apr 2020 03:08:28 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jPL6w-000KNJ-HK; Fri, 17 Apr 2020 10:08:27 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Date: Fri, 17 Apr 2020 10:08:13 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200417070814.2044774-1-luca@coelho.fi> References: <20200417070814.2044774-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.4 Subject: [PATCH v2 v5.7 5/6] iwlwifi: mvm: Do not declare support for ACK Enabled Aggregation Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ilan Peer As this was not supposed to be enabled to begin with. Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Ilan Peer Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index 9e9810d2b262..ccf0bc16465d 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -532,8 +532,7 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US | IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8, .mac_cap_info[2] = - IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP | - IEEE80211_HE_MAC_CAP2_ACK_EN, + IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP, .mac_cap_info[3] = IEEE80211_HE_MAC_CAP3_OMI_CONTROL | IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2, @@ -617,8 +616,7 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US | IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8, .mac_cap_info[2] = - IEEE80211_HE_MAC_CAP2_BSR | - IEEE80211_HE_MAC_CAP2_ACK_EN, + IEEE80211_HE_MAC_CAP2_BSR, .mac_cap_info[3] = IEEE80211_HE_MAC_CAP3_OMI_CONTROL | IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2, -- 2.25.1