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 <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 3b8ae49c3ea2b6bb3bbd44b90476bb5d3d4ac875..b8cc064ee9f53433bf6b71db6c8a747d3b6c064b 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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;
@@ -3935,7 +3929,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;
        }
 }