Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4458250ybz; Tue, 28 Apr 2020 11:37:58 -0700 (PDT) X-Google-Smtp-Source: APiQypK5JGeUDYY+tuRsirvxyme/shhnfsjIg9p9vLxaVRTAt+ON1sdT95AgaUS+mfG+vSU0/iGc X-Received: by 2002:a17:906:6a02:: with SMTP id o2mr25459106ejr.223.1588099078631; Tue, 28 Apr 2020 11:37:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588099078; cv=none; d=google.com; s=arc-20160816; b=qV7fT02AeXHkAG7dDWqnb5WczSnexAqpyPUjISBom5IYUle2gcO66BK5Jcz/1fKeT/ 9z0cDcCIrpbpf98+4FDVUoH4NxA/l2RO5AaE4fRXMJrn4Of+ZxZBu5Id8MugUOjd2EVJ BIqeabimxyBQrJ6NvVW1m+/ObNRbyGjQ1fVPRnxaKo81TxFRBb0bxp37mf2QSLxGteiq PDHCT8HfSUN3irqSeiyTmPupgwbuo3ZCOXaFT3iwRkC1MZA/bzXhHUCR3Zt5AiILAgZ8 fbf+FWaB4wbYXh80Z4mhC2hxthR0ERVC3xy+nv1cpySArUW0fFbzVGIhaVTLg/9n9Ai9 +McQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7B52WJ3ZLTHWZLKhowz+YlDITsxqovJplaKB3R1aXos=; b=XpyaszKDm93oa8qkllotzhhnNGR+B6i4TLQBeCw9i14iSGjOr/R3VyG2SGQn4xWcIR SIAexddZ4qvgd2ra6EblhSsbWtQK6B5UhuweieShdpibrL01D3vPnFs0nB2yK7mfHVsV yoGxV9K5mkGRM2dIR6NXB6Rs6Q+SlO9oCd9xPn8foIGTb/NGB+zcth/alx9cPh5apdfv NBjRqQfgMukQyhDe6883nt0fZXGEm6yonAUx3CNT8JPR0tFbCXGUu+OVMKNtOW9se+sz D88XpZ84oSkUXjjGz/fpOpuVF/lGBfwF8aflL1YrpotUsGtCtBVaAzLaEVqkEteC0sgr jf9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="zlKj/voj"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 n1si2251556ejr.104.2020.04.28.11.37.34; Tue, 28 Apr 2020 11:37:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="zlKj/voj"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730212AbgD1SfK (ORCPT + 99 others); Tue, 28 Apr 2020 14:35:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:52168 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728668AbgD1SfI (ORCPT ); Tue, 28 Apr 2020 14:35:08 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC07420575; Tue, 28 Apr 2020 18:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588098908; bh=ENd1jNNo5OkQqzs81452LlPPJZkaniS6ivTo+Kng45o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zlKj/voj70zTcETokcR3BKufhjDuAa8/3mZGgm9oRSUNTvBmjduNW3CVt0WZpwI6v 5XTw+Y7B4SxQWeFMmCSxfFrMo6UmZ2r75jLf3x4PGYpLMuK5IrRDtEr8TXac1wnDcw Fm9+9ee0FvZTwgoS9TD9AZ1vKkGv1q5kOHhJUYQw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilan Peer , Luca Coelho , Kalle Valo Subject: [PATCH 5.6 127/167] iwlwifi: mvm: Do not declare support for ACK Enabled Aggregation Date: Tue, 28 Apr 2020 20:25:03 +0200 Message-Id: <20200428182241.412541212@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182225.451225420@linuxfoundation.org> References: <20200428182225.451225420@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ilan Peer commit 38af8d5a90a8c3b41ff0484855e24bd55b43ce9d upstream. 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 Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/iwlwifi.20200417100405.53dbc3c6c36b.Idfe118546b92cc31548b2211472a5303c7de5909@changeid Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- 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_dat 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_dat 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,