diff options
| author |   Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-04-22 22:20:56 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-04-23 13:31:57 -0700 |
| commit | 787082ab9f7be4711e52f67c388535eda74a1269 (patch) | |
| tree | e177587a74526025252b8dcfcce3095ca040d7a4 /drivers/net/ethernet/mediatek | |
| parent | net: ethernet: mtk_eth_soc: unmap RX data before calling build_skb (diff) | |
| download | linux-dev-787082ab9f7be4711e52f67c388535eda74a1269.tar.xz linux-dev-787082ab9f7be4711e52f67c388535eda74a1269.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/mediatek')
| -rw-r--r-- | drivers/net/ethernet/mediatek/mtk_eth_soc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 540003f3fcb8..07daa5de8bec 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -1304,9 +1304,9 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, /* 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); @@ -1326,6 +1326,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, skb_record_rx_queue(skb, 0); napi_gro_receive(napi, skb); +skip_rx: ring->data[idx] = new_data; rxd->rxd1 = (unsigned int)dma_addr; |