3ca9849589
Manually rebased: backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch Removed upstreamed: bcm47xx/patches-5.10/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.175&id=cbf11ff3708ff163387da924f80a47ce7c721e9b Signed-off-by: John Audia <therealgraysky@proton.me>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 787082ab9f7be4711e52f67c388535eda74a1269 Mon Sep 17 00:00:00 2001
|
|
From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
|
Date: Thu, 22 Apr 2021 22:20:56 -0700
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: fix build_skb cleanup
|
|
|
|
In case build_skb fails, call skb_free_frag on the correct pointer. Also
|
|
update the DMA structures with the new mapping before exiting, because
|
|
the mapping was successful
|
|
|
|
Suggested-by: Felix Fietkau <nbd@nbd.name>
|
|
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -1340,9 +1340,9 @@ static int mtk_poll_rx(struct napi_struc
|
|
/* receive data */
|
|
skb = build_skb(data, ring->frag_size);
|
|
if (unlikely(!skb)) {
|
|
- skb_free_frag(new_data);
|
|
+ skb_free_frag(data);
|
|
netdev->stats.rx_dropped++;
|
|
- goto release_desc;
|
|
+ goto skip_rx;
|
|
}
|
|
skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);
|
|
|
|
@@ -1362,6 +1362,7 @@ static int mtk_poll_rx(struct napi_struc
|
|
skb_record_rx_queue(skb, 0);
|
|
napi_gro_receive(napi, skb);
|
|
|
|
+skip_rx:
|
|
ring->data[idx] = new_data;
|
|
rxd->rxd1 = (unsigned int)dma_addr;
|
|
|