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>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 6182e7d33e014cf5ad184bb0beb4c73d2bf67889..faa4041cfb113632424d663181d4bb6d669f3563 100644 (file)
--- 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;