]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: rtl8xxxu: Fix RX skb size for aggregation disabled
authorMartin Kaistra <martin.kaistra@linutronix.de>
Wed, 9 Jul 2025 12:15:22 +0000 (14:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Aug 2025 10:13:43 +0000 (12:13 +0200)
[ Upstream commit d76a1abcf57734d2bcd4a7ec051617edd4513d7f ]

Commit 1e5b3b3fe9e0 ("rtl8xxxu: Adjust RX skb size to include space for
phystats") increased the skb size when aggregation is enabled but decreased
it for the aggregation disabled case.

As a result, if a frame near the maximum size is received,
rtl8xxxu_rx_complete() is called with status -EOVERFLOW and then the
driver starts to malfunction and no further communication is possible.

Restore the skb size in the aggregation disabled case.

Fixes: 1e5b3b3fe9e0 ("rtl8xxxu: Adjust RX skb size to include space for phystats")
Signed-off-by: Martin Kaistra <martin.kaistra@linutronix.de>
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250709121522.1992366-1-martin.kaistra@linutronix.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/realtek/rtl8xxxu/core.c

index 569856ca677f623e4688a0b7387ac3ac84ade23d..c6f69d87c38d415039a6c07a4bb425fc52e80d45 100644 (file)
@@ -6617,7 +6617,7 @@ static int rtl8xxxu_submit_rx_urb(struct rtl8xxxu_priv *priv,
                skb_size = fops->rx_agg_buf_size;
                skb_size += (rx_desc_sz + sizeof(struct rtl8723au_phy_stats));
        } else {
-               skb_size = IEEE80211_MAX_FRAME_LEN;
+               skb_size = IEEE80211_MAX_FRAME_LEN + rx_desc_sz;
        }
 
        skb = __netdev_alloc_skb(NULL, skb_size, GFP_KERNEL);