From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F2AFFCD11DD for ; Fri, 29 Mar 2024 12:32:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Xo+LpHHt+3svqvV+x38hWo04viihC1UG8beyaxMoUDY=; b=aWEjQt0MxJhWbl 0y/O7JLpYjSVcsUpT0XgoLY2N8RnINAKkhiPsxsx76riMCGy0H9JyaClVDC9DDTp4AkS+9qgiGyRA OtPdap6SGdGonpREQksmtS23Rco456iw58fjOOpEHI0W16qjFxPOaN/vhw2ff5NbBqN3J/7RXYJtS MQVMIvkRyna2Grj9NqJ5awCVmYDZp7O2itVW7hCHFT4qQ+zej4LlU1grmV1lc5+I/t9a4lGHFqB3L LX4/xZqHJXY1gon3CaBUF1OLS7x5AsxJDSBR4Lu/LN4FPlVaOGvV8r+0I8q7J7g7qNPSjqs7gXi5Z ftOJGtxtGUMs/yWzOvcw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rqBPQ-00000000N3K-3DtX; Fri, 29 Mar 2024 12:32:36 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rqBNs-00000000MYw-3Djx; Fri, 29 Mar 2024 12:31:02 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 2807A6192A; Fri, 29 Mar 2024 12:31:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CA6EC433C7; Fri, 29 Mar 2024 12:30:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711715459; bh=cJLl/5YT8hRa+slFM39tOxmQdtagQbxhdmoB7z3z99I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qX9i/f7U2JbIE0tEtWxJocj3Y+sCxcHEf9ljdr7kmOG7BsVnbBmJhEIH78z3VKdpC gFKp5Eadt2TroAjeJWzjeTSW6kisypHQaPIYfx+SZQXexwQUalLzVSSS/kUA1JFcr6 aLfUJlUF0sOtcPM6LAGRXoEzMS4uRh7cmRhWxdsFbwx9NCzT8fJnARSywbfGaVKFb3 vodT2+jv3h1NQOdWMdwivS3eADCStM3Hy7oNrgrv/CubB9AiuMQ+IGUcAqPNMmOz1J SCF67ylP0/OCFFrG/nEOtTsTrN6XaqC/oAh3Zf2rZxHzLH1AJopMZVkRDQKb6mP29d 21Wlanz3TpTiQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Chiu , Shayne Chen , Felix Fietkau , Sasha Levin , lorenzo@kernel.org, ryder.lee@mediatek.com, kvalo@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, yi-chia.hsieh@mediatek.com, Bo.Jiao@mediatek.com, benjamin-jw.lin@mediatek.com, linux-wireless@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 6.6 30/52] wifi: mt76: mt7996: disable AMSDU for non-data frames Date: Fri, 29 Mar 2024 08:29:00 -0400 Message-ID: <20240329122956.3083859-30-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329122956.3083859-1-sashal@kernel.org> References: <20240329122956.3083859-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.23 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240329_053101_040381_9AC1FCCB X-CRM114-Status: UNSURE ( 9.55 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peter Chiu [ Upstream commit 5d5edc09197cd8c705b42a73cdf8ba03db53c033 ] Disable AMSDU for non-data frames to prevent TX token leak issues. Signed-off-by: Peter Chiu Signed-off-by: Shayne Chen Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c index 26d5675202ba9..066b5a494ef61 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c @@ -757,6 +757,9 @@ mt7996_mac_write_txwi_8023(struct mt7996_dev *dev, __le32 *txwi, FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype); txwi[2] |= cpu_to_le32(val); + + if (wcid->amsdu) + txwi[3] |= cpu_to_le32(MT_TXD3_HW_AMSDU); } static void @@ -887,8 +890,6 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, val |= MT_TXD3_PROTECT_FRAME; if (info->flags & IEEE80211_TX_CTL_NO_ACK) val |= MT_TXD3_NO_ACK; - if (wcid->amsdu) - val |= MT_TXD3_HW_AMSDU; txwi[3] = cpu_to_le32(val); txwi[4] = 0; -- 2.43.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel