Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / sun / niu.c

diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index a2a1d32742a6af470b4d52a17091ddb4aa538224..0c64162138377e31cd8a8a7b09adb42a1124cd39 100644 (file)
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -6651,13 +6651,8 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb,
                return NETDEV_TX_BUSY;
        }
 
-       if (skb->len < ETH_ZLEN) {
-               unsigned int pad_bytes = ETH_ZLEN - skb->len;
-
-               if (skb_pad(skb, pad_bytes))
-                       goto out;
-               skb_put(skb, pad_bytes);
-       }
+       if (eth_skb_pad(skb))
+               goto out;
 
        len = sizeof(struct tx_pkt_hdr) + 15;
        if (skb_headroom(skb) < len) {