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, 5 insertions, 14 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 82d418729dd4..fbd52924ee34 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1774,14 +1774,9 @@ static bool ixgbe_cleanup_headers(struct ixgbe_ring *rx_ring,
                 return false;
 
 #endif
-        /* if skb_pad returns an error the skb was freed */
-        if (unlikely(skb->len < 60)) {
-                int pad_len = 60 - skb->len;
-
-                if (skb_pad(skb, pad_len))
-                        return true;
-                __skb_put(skb, pad_len);
-        }
+        /* if eth_skb_pad returns an error the skb was freed */
+        if (eth_skb_pad(skb))
+                return true;
 
         return false;
 }
@@ -7334,12 +7329,8 @@ static netdev_tx_t __ixgbe_xmit_frame(struct sk_buff *skb,
          * The minimum packet size for olinfo paylen is 17 so pad the skb
          * in order to meet this minimum size requirement.
          */
-        if (unlikely(skb->len < 17)) {
-                if (skb_pad(skb, 17 - skb->len))
-                        return NETDEV_TX_OK;
-                skb->len = 17;
-                skb_set_tail_pointer(skb, 17);
-        }
+        if (skb_put_padto(skb, 17))
+                return NETDEV_TX_OK;
 
         tx_ring = ring ? ring : adapter->tx_ring[skb->queue_mapping];