r8169: Use eth_skb_pad function

Replace rtl_skb_pad with eth_skb_pad since they do the same thing.

Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 56280c1fc0ed22a495a31f4521bbcb92baf9e133..b9c2f33b463d45601f3ef60da592fde90ae12d5d 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -6836,14 +6836,6 @@ err_out:
        return -EIO;
 }
 
-static bool rtl_skb_pad(struct sk_buff *skb)
-{
-       if (skb_padto(skb, ETH_ZLEN))
-               return false;
-       skb_put(skb, ETH_ZLEN - skb->len);
-       return true;
-}
-
 static bool rtl_test_hw_pad_bug(struct rtl8169_private *tp, struct sk_buff *skb)
 {
        return skb->len < ETH_ZLEN && tp->mac_version == RTL_GIGA_MAC_VER_34;
@@ -6984,7 +6976,7 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp,
                u8 ip_protocol;
 
                if (unlikely(rtl_test_hw_pad_bug(tp, skb)))
-                       return skb_checksum_help(skb) == 0 && rtl_skb_pad(skb);
+                       return !(skb_checksum_help(skb) || eth_skb_pad(skb));
 
                if (transport_offset > TCPHO_MAX) {
                        netif_warn(tp, tx_err, tp->dev,
@@ -7019,7 +7011,7 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp,
                opts[1] |= transport_offset << TCPHO_SHIFT;
        } else {
                if (unlikely(rtl_test_hw_pad_bug(tp, skb)))
-                       return rtl_skb_pad(skb);
+                       return !eth_skb_pad(skb);
        }
 
        return true;