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 2F0EEC433EF for ; Wed, 18 May 2022 12:38:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237169AbiERMec (ORCPT ); Wed, 18 May 2022 08:34:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237032AbiERMdR (ORCPT ); Wed, 18 May 2022 08:33:17 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9170170F16; Wed, 18 May 2022 05:29:36 -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 BED30B81F40; Wed, 18 May 2022 12:29:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E3D7C34119; Wed, 18 May 2022 12:29:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652876973; bh=3GySsgKbj9YOlHOOORgomtwxeGx2+Fwp1qtu2bu+WUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mzCfu1pB0iUmZ0J7SPazVmmhkI7mLoK3dZX+JY1f7RjCmuti6aAKPmOKtDIj9rRnf Fg2A1eLBa8QPIQKodeT0QHt+NVAzIqbqvyKxjqKRTf/n5O0VKdGjFFRh1hmFXSL/VL uvxFIUIR9kJUWSGKA5FYrHyxmFy46xATS2DhxPZaO9/MHjPVEVvu/4BH6aiDfRBWhm aJCDD7MyEOkeqEndZnA5FDO+fJz/BhbctT/l3B++9aOc7SKkZ6ph5Ht9hfOQeJEgqt i0sEOyACdzdbkn6RnwSy2DcPnjvPNEGFHXooY7IVIzroY44d/2j7mNd520TIBm1NVE QsdUvIOImsgTg== 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 5.4 2/6] mac80211: fix rx reordering with non explicit / psmp ack policy Date: Wed, 18 May 2022 08:29:25 -0400 Message-Id: <20220518122929.343615-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220518122929.343615-1-sashal@kernel.org> References: <20220518122929.343615-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 ab91683d9459..99d5f8b58e92 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1400,8 +1400,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