| 1234567891011121314151617181920212223242526272829303132333435363738 |
- From 787082ab9f7be4711e52f67c388535eda74a1269 Mon Sep 17 00:00:00 2001
- From: Ilya Lipnitskiy <[email protected]>
- 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 <[email protected]>
- Signed-off-by: Ilya Lipnitskiy <[email protected]>
- Signed-off-by: David S. Miller <[email protected]>
- ---
- 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
- @@ -1325,9 +1325,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);
-
- @@ -1347,6 +1347,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;
-
|
