summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@redhat.com>2014-12-03 08:17:52 -0800
committerDavid S. Miller <davem@davemloft.net>2014-12-08 20:47:42 -0500
commit28f7936cdf7d445570b214123f45866d3f6aa836 (patch)
tree733718dbf25c2a092f0e9d9518cbab5564468e5d
parent74b6939de3aea269627537e5178c973c3f123690 (diff)
downloadblackbird-obmc-linux-28f7936cdf7d445570b214123f45866d3f6aa836.tar.gz
blackbird-obmc-linux-28f7936cdf7d445570b214123f45866d3f6aa836.zip
niu: Use eth_skb_pad helper
Replace the standard layout for padding an ethernet frame with the eth_skb_pad call. Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/sun/niu.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 904fd1ab5f6e..4aaa3240453a 100644
--- 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) {
OpenPOWER on IntegriCloud