Since RX reordering moved to the primary link of an MLD peer, wcid->aggr of a secondary link stays empty, and mt76_rx_aggr_reorder() follows def_wcid to find the session. mt76_rx_aggr_check_ctl() does not. A BlockAckReq received on a secondary link therefore finds no session and releases nothing, and frames behind the hole wait for the reorder timeout. Read the session from the primary link, as mt76_rx_aggr_reorder() does. Fixes: 6ccb6bb9bd7d ("wifi: mt76: mt7996: Use deflink for AMPDU rx reordering") Signed-off-by: Felix Fietkau --- drivers/net/wireless/mediatek/mt76/agg-rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c index 49721b4faab1..5e0adbfd36a6 100644 --- a/drivers/net/wireless/mediatek/mt76/agg-rx.c +++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c @@ -143,7 +143,7 @@ mt76_rx_aggr_check_ctl(struct sk_buff *skb, struct sk_buff_head *frames) status->qos_ctl = tidno = le16_to_cpu(bar->control) >> 12; seqno = IEEE80211_SEQ_TO_SN(le16_to_cpu(bar->start_seq_num)); - tid = rcu_dereference(wcid->aggr[tidno]); + tid = rcu_dereference(mt76_wcid_primary(wcid)->aggr[tidno]); if (!tid) return; -- 2.47.3