From nobody Sun Feb 8 01:30:54 2026 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 BA0CCC433F5 for ; Mon, 23 May 2022 17:05:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239331AbiEWRFG (ORCPT ); Mon, 23 May 2022 13:05:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239224AbiEWREg (ORCPT ); Mon, 23 May 2022 13:04:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A75D1606C2; Mon, 23 May 2022 10:04:35 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 03042614C1; Mon, 23 May 2022 17:04:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05D54C385A9; Mon, 23 May 2022 17:04:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1653325474; bh=J5AZ6YoBIpezjSlGXkcI10G3x5B8FyKLScmskPDYuuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z3GBQW4ybRAI86qc4CFzd/aCI8Az3Jx45p1CRwoaQPWJ14xO+IWx6+O0Vmj2lPICX Quq1oq03SuBPwbVWzu2RJdUmjJMWmT5JrPI/8I6BUF/qOKXMVgDVWOy9l0yMpyrGIT IaPylWTB9YqUGXDaEkq40/1YQsACcVHSJ0LLdKRI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Fietkau , Johannes Berg , Sasha Levin Subject: [PATCH 4.9 23/25] mac80211: fix rx reordering with non explicit / psmp ack policy Date: Mon, 23 May 2022 19:03:41 +0200 Message-Id: <20220523165749.857405906@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220523165743.398280407@linuxfoundation.org> References: <20220523165743.398280407@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Felix Fietkau [ Upstream commit 5e469ed9764d4722c59562da13120bd2dc6834c5 ] When the QoS ack policy was set to non explicit / psmp ack, frames are trea= ted 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 41af02a70742..02845bed07d7 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1179,8 +1179,7 @@ static void ieee80211_rx_reorder_ampdu(struct ieee802= 11_rx_data *rx, goto dont_reorder; =20 /* not part of a BA session */ - if (ack_policy !=3D IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK && - ack_policy !=3D IEEE80211_QOS_CTL_ACK_POLICY_NORMAL) + if (ack_policy =3D=3D IEEE80211_QOS_CTL_ACK_POLICY_NOACK) goto dont_reorder; =20 /* new, potentially un-ordered, ampdu frame - process it */ --=20 2.35.1