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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85CADC433EF for ; Wed, 18 May 2022 12:38:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237424AbiERMgF (ORCPT ); Wed, 18 May 2022 08:36:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237066AbiERMeP (ORCPT ); Wed, 18 May 2022 08:34:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 931C31059FE; Wed, 18 May 2022 05:30:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A237AB81FBB; Wed, 18 May 2022 12:29:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35330C385AA; Wed, 18 May 2022 12:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652876990; bh=KxUHMxCtT1XT8i2oOCZgReXE0uqJrutH4S+iLI9/Svw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mLCrHqC9eVi/RtNIN8uxwLotVzhpn0ZBPJCmD1ZeuyWvdQuCAI/hoeBTJ80rk+ohW lzHOEn6upppnwkqwU7DqOnnNuJASjB/EgwgicQFsD4xPXixYXxx3xLzJUYUTmjrE6M vnzp8oUteyDfWkns2Y7LjfMMCPlbWZIA3hS6IJuAS1PzpruiHbPhPUARr221e56zfq 0vMblsE+ExinZblZlWphFRJtl/EN8e1fZba423VgLUbc27lbvkVFPEjSXd0hcnHmIh 7+C1JuDa7p0kmg3YLr88F9FgVVHtabRFKz/g7G1NwN3J567R4xftNaaJdxh63a6Sdp yGHd007OjdvNg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Felix Fietkau , Johannes Berg , Sasha Levin , johannes@sipsolutions.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 2/5] mac80211: fix rx reordering with non explicit / psmp ack policy Date: Wed, 18 May 2022 08:29:42 -0400 Message-Id: <20220518122946.343712-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220518122946.343712-1-sashal@kernel.org> References: <20220518122946.343712-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Felix Fietkau [ Upstream commit 5e469ed9764d4722c59562da13120bd2dc6834c5 ] When the QoS ack policy was set to non explicit / psmp ack, frames are treated as not being part of a BA session, which causes extra latency on reordering. Fix this by only bypassing reordering for packets with no-ack policy Signed-off-by: Felix Fietkau Link: https://lore.kernel.org/r/20220420105038.36443-1-nbd@nbd.name Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/rx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index f30b732af61d..3598ebe52d08 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1322,8 +1322,7 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx, goto dont_reorder; /* not part of a BA session */ - if (ack_policy != IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK && - ack_policy != IEEE80211_QOS_CTL_ACK_POLICY_NORMAL) + if (ack_policy == IEEE80211_QOS_CTL_ACK_POLICY_NOACK) goto dont_reorder; /* new, potentially un-ordered, ampdu frame - process it */ -- 2.35.1