diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2020-05-18 22:22:09 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-18 17:46:15 -0700 |
| commit | e2e5fb8d2f7aedb66fea0722f0f712cd37592a5d (patch) | |
| tree | 7d68f0db4e4962c20d459f1b4e510e8db2fa4685 /drivers/net/ethernet/realtek | |
| parent | 588c7e5cc04805fae17cac51e77107841b0c62b0 (diff) | |
| download | linux-e2e5fb8d2f7aedb66fea0722f0f712cd37592a5d.tar.gz linux-e2e5fb8d2f7aedb66fea0722f0f712cd37592a5d.tar.bz2 linux-e2e5fb8d2f7aedb66fea0722f0f712cd37592a5d.zip | |
r8169: improve rtl8169_mark_to_asic
Let the compiler decide about inlining, and as confirmed by Eric it's
better to use WRITE_ONCE here to ensure that the descriptor ownership
is transferred to NIC immediately.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index e887ee1e308f..23f1500928cb 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3824,15 +3824,14 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu) return 0; } -static inline void rtl8169_mark_to_asic(struct RxDesc *desc) +static 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(); - - desc->opts1 = cpu_to_le32(DescOwn | eor | R8169_RX_BUF_SIZE); + WRITE_ONCE(desc->opts1, cpu_to_le32(DescOwn | eor | R8169_RX_BUF_SIZE)); } static struct page *rtl8169_alloc_rx_data(struct rtl8169_private *tp, |