* [PATCH net-next] r8169: let rtl8169_mark_to_asic clear rx descriptor field opts2
@ 2020-03-10 22:14 Heiner Kallweit
2020-03-10 23:24 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Heiner Kallweit @ 2020-03-10 22:14 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: netdev
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>
---
drivers/net/ethernet/realtek/r8169_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 181b35b78..c0731c33c 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 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget
u64_stats_update_end(&tp->rx_stats.syncp);
}
release_descriptor:
- desc->opts2 = 0;
rtl8169_mark_to_asic(desc);
}
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] r8169: let rtl8169_mark_to_asic clear rx descriptor field opts2
2020-03-10 22:14 [PATCH net-next] r8169: let rtl8169_mark_to_asic clear rx descriptor field opts2 Heiner Kallweit
@ 2020-03-10 23:24 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-03-10 23:24 UTC (permalink / raw)
To: hkallweit1; +Cc: nic_swsd, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Tue, 10 Mar 2020 23:14:41 +0100
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-10 23:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-10 22:14 [PATCH net-next] r8169: let rtl8169_mark_to_asic clear rx descriptor field opts2 Heiner Kallweit
2020-03-10 23:24 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).