From: Felix Fietkau <nbd@nbd.name>
Date: Wed, 20 Apr 2022 11:20:23 +0000 (+0200)
Subject: mt76: do not attempt to reorder received 802.3 packets without agg session
X-Git-Tag: v5.19-rc1~159^2~59^2~20^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3968a66475b40691c37b5e6c76975f699671e10e;p=thirdparty%2Flinux.git

mt76: do not attempt to reorder received 802.3 packets without agg session

Fixes potential latency / packet drop issues in cases where a BA session has
not (yet) been established.

Fixes: e195dad14115 ("mt76: add support for 802.3 rx frames")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c
index 9b8e1dfbc8141..10cbd9e560e72 100644
--- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
+++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
@@ -162,8 +162,9 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames)
 	if (!sta)
 		return;
 
-	if (!status->aggr && !(status->flag & RX_FLAG_8023)) {
-		mt76_rx_aggr_check_ctl(skb, frames);
+	if (!status->aggr) {
+		if (!(status->flag & RX_FLAG_8023))
+			mt76_rx_aggr_check_ctl(skb, frames);
 		return;
 	}