diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-08-26 22:52:36 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-26 14:33:28 -0700 |
| commit | 3c95e5013b7f204a03757691367857b7b668163a (patch) | |
| tree | c98c94dd3228237c755a41dff3f6a8c806760c58 | |
| parent | Merge branch 'cls-hw-offload-rtnl' (diff) | |
| download | linux-dev-3c95e5013b7f204a03757691367857b7b668163a.tar.xz linux-dev-3c95e5013b7f204a03757691367857b7b668163a.zip | |
r8169: improve DMA handling in rtl_rx
Move the call to dma_sync_single_for_cpu after calling napi_alloc_skb.
This avoids calling dma_sync_single_for_cpu w/o handing control back
to device if the memory allocation should fail.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 6182e7d33e01..faa4041cfb11 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5807,16 +5807,15 @@ process_pkt: goto release_descriptor; } - dma_sync_single_for_cpu(tp_to_dev(tp), - le64_to_cpu(desc->addr), - pkt_size, DMA_FROM_DEVICE); - skb = napi_alloc_skb(&tp->napi, pkt_size); if (unlikely(!skb)) { dev->stats.rx_dropped++; goto release_descriptor; } + dma_sync_single_for_cpu(tp_to_dev(tp), + le64_to_cpu(desc->addr), + pkt_size, DMA_FROM_DEVICE); prefetch(rx_buf); skb_copy_to_linear_data(skb, rx_buf, pkt_size); skb->tail += pkt_size; |