r8169: inline rtl8169_make_unusable_by_asic
Heiner Kallweit
maintainerPATCH 1/1 r8169: inline rtl8169_make_unusable_by_asic
Inline rtl8169_make_unusable_by_asic() and simplify it:
- Address field doesn't need to be poisoned because descriptor is owned by CPU now
- desc->opts1 is set by rtl8169_mark_to_asic() and rtl8169_rx_fill(), therefore we don't have to preserve any field parts.
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/ethernet/realtek/r8169_main.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +2 -7
@@ -3882,12 +3882,6 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)return 0 ; } -static inline void rtl8169_make_unusable_by_asic (struct RxDesc *desc) -{ - desc->addr =cpu_to_le64 (0x0badbadbadbadbadull ); - desc->opts1 &= ~cpu_to_le32 (DescOwn | RsvdMask); -} -static inline void rtl8169_mark_to_asic (struct RxDesc *desc) {u32 eor =le32_to_cpu (desc->opts1) & RingEnd;
@@ -3933,7 +3927,8 @@ static void rtl8169_rx_clear(struct rtl8169_private *tp) R8169_RX_BUF_SIZE, DMA_FROM_DEVICE);__free_pages (tp->Rx_databuff[i],get_order (R8169_RX_BUF_SIZE )); tp->Rx_databuff[i] =NULL ; -rtl8169_make_unusable_by_asic (tp->RxDescArray + i); + tp->RxDescArray[i].addr =0 ; + tp->RxDescArray[i].opts1 =0 ; } }
Signature · 1 line
2.26.1
From: Heiner Kallweit <[email protected]>
Date: Sun, 19 Apr 2020 23:16:55 +0200
Quoted 7 lines
Inline
rtl8169_make_unusable_by_asic()and simplify it:
- Address field doesn't need to be poisoned because descriptor is owned by CPU now
-desc->opts1is set byrtl8169_mark_to_asic()andrtl8169_rx_fill(), therefore we don't have to preserve any field parts.Signed-off-by Heiner Kallweit <[email protected]>
Applied.