Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4466000ybz; Tue, 28 Apr 2020 11:46:03 -0700 (PDT) X-Google-Smtp-Source: APiQypK6a2Rmo18gyK3UjyOQZC1K10RvnJktm+nuYCcByBGG/kTJvPd4qZZW3Y6oLSIrvVGRV245 X-Received: by 2002:a17:906:ad9a:: with SMTP id la26mr25958933ejb.128.1588099563234; Tue, 28 Apr 2020 11:46:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588099563; cv=none; d=google.com; s=arc-20160816; b=SjC0e5YfCOQ0NFqQPxWEZz3dAnTfTw+eOAC5q9INB8yPtAkxpY6wsnP/hKq1axmb3f k1scavdqLpgMuRMWgdbcZBDWgDIsLrtKaOCTlZVEf5/Zff0bbh7AwWjvOhfQxybD/ZjF TD11YJq1QNs+/ri0pPVfgN/7t7o8p3Pbdffu42PeKk9Hu+Q6EsdXyJVtQCn/ptQsw6RJ ROcvtEPnA1WN10cs22ZdFTNWbCWYy1+zjphYmcSWohnoMgqg1x9mhzlNvKPyNgMmGuaX N77V2B99nM6THdAyRSdakE1S+KBMBYQ4PYmty6SegYcFWCYCNp3TiGcqmuC5CLYQcicN jOug== 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=BkcBWZtP09+rTBF86/I6B5Yv7Q3zWCrW/MNZhtmqCVQ=; b=XnV9P5/BIul7h5VNoIh+UBx5P8nTNKmv/KL+i3KHej0ZzT8Of9wAY/gp48/s5wOrrE aCMtIb7LCldUSEKpSFvhRnFodrRafo0zf40s+d/aWUjaJQoBsryGh2+HuY7vwHk7cmOG BGYAMNA5rNXF1TWXEQ7FnmsgE3bfI+Zy9HuhR0dGxiHTcuxOAtR4mUr5XY1egBhKUXxy DHqQ/1e98cyy6XZAngZh6MuzKltzsNh6W32OkpEUd77l0upBocJFgUXrcm1REAVGi/IN kIFRzTfEjkJIQEtKAjI+MhjJzauv0T6ATLK4ZfxYlkEzrG4Exy2WqdCBt72Cc4cRjo1J sxIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dOd1+BgT; 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 gy26si2502792ejb.384.2020.04.28.11.45.38; Tue, 28 Apr 2020 11:46:03 -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=dOd1+BgT; 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 S1731211AbgD1SnR (ORCPT + 99 others); Tue, 28 Apr 2020 14:43:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:35542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731202AbgD1SnO (ORCPT ); Tue, 28 Apr 2020 14:43:14 -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 E698C20575; Tue, 28 Apr 2020 18:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099393; bh=hBYyPRpUugYM2RKU4wm2ghw09N54/z4/XyL37XBU07E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dOd1+BgTVIZI2QcLaNQkFxxvBqDa6mR2jroWN/KJAFrDRpGoPP62m53TgMZ35fWTM lk4ahu+LSEeGKui08Acynrq89yoxRj6+e/KUDS7KrgPg9bDgGpJx4i9VFyLTPylusW N4L9p3AFzpOAACcdxdSLhz479sNjphDEo7zCWVRE= 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.4 131/168] iwlwifi: mvm: Do not declare support for ACK Enabled Aggregation Date: Tue, 28 Apr 2020 20:25:05 +0200 Message-Id: <20200428182248.630387041@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182231.704304409@linuxfoundation.org> References: <20200428182231.704304409@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 @@ -525,8 +525,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, @@ -610,8 +609,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,