r8169: let rtl8169_mark_to_asic clear rx descriptor field opts2

Clearing opts2 belongs to preparing the descriptor for DMA engine use.
Therefore move it into rtl8169_mark_to_asic().

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 181b35b78c61d5f55500b1130d640c8602931bd7..c0731c33c31e49b90b4bd2aa38476ce9e69ec44c 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -3889,6 +3889,7 @@ static inline void rtl8169_mark_to_asic(struct RxDesc *desc)
 {
        u32 eor = le32_to_cpu(desc->opts1) & RingEnd;
 
+       desc->opts2 = 0;
        /* Force memory writes to complete before releasing descriptor */
        dma_wmb();
 
@@ -4543,7 +4544,6 @@ process_pkt:
                        u64_stats_update_end(&tp->rx_stats.syncp);
                }
 release_descriptor:
-               desc->opts2 = 0;
                rtl8169_mark_to_asic(desc);
        }