Commit 047521d7 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ee24258
...@@ -3889,6 +3889,7 @@ static inline void rtl8169_mark_to_asic(struct RxDesc *desc) ...@@ -3889,6 +3889,7 @@ static inline void rtl8169_mark_to_asic(struct RxDesc *desc)
{ {
u32 eor = le32_to_cpu(desc->opts1) & RingEnd; u32 eor = le32_to_cpu(desc->opts1) & RingEnd;
desc->opts2 = 0;
/* Force memory writes to complete before releasing descriptor */ /* Force memory writes to complete before releasing descriptor */
dma_wmb(); dma_wmb();
...@@ -4543,7 +4544,6 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget ...@@ -4543,7 +4544,6 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget
u64_stats_update_end(&tp->rx_stats.syncp); u64_stats_update_end(&tp->rx_stats.syncp);
} }
release_descriptor: release_descriptor:
desc->opts2 = 0;
rtl8169_mark_to_asic(desc); rtl8169_mark_to_asic(desc);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment