diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2020-03-10 23:14:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-10 16:23:23 -0700 |
| commit | 047521d7b12d7a6b7165de2c67c71275f223c0a6 (patch) | |
| tree | 7b6ccfdeff09f0b4dc08c61dbab7e0adc3529138 /drivers | |
| parent | 6ee24258044722db38519594e13d0502469b946b (diff) | |
| download | linux-047521d7b12d7a6b7165de2c67c71275f223c0a6.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 181b35b78c61..c0731c33c31e 100644 --- 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); } |