ethernet/intel: Use eth_skb_pad and skb_put_padto helpers

Update the Intel Ethernet drivers to use eth_skb_pad() and skb_put_padto
instead of doing their own implementations of the function.

Also this cleans up two other spots where skb_pad was called but the length
and tail pointers were being manipulated directly instead of just having
the padding length added via __skb_put.

Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 24f3986cfae2..862d1989ae1c 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -3136,12 +3136,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
          * packets may get corrupted during padding by HW.
          * To WA this issue, pad all small packets manually.
          */
-        if (skb->len < ETH_ZLEN) {
-                if (skb_pad(skb, ETH_ZLEN - skb->len))
-                        return NETDEV_TX_OK;
-                skb->len = ETH_ZLEN;
-                skb_set_tail_pointer(skb, ETH_ZLEN);
-        }
+        if (eth_skb_pad(skb))
+                return NETDEV_TX_OK;
 
         mss = skb_shinfo(skb)->gso_size;
         /* The controller does a simple calculation to