Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[~andy/linux] / drivers / net / sonic.c

diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index 90b818a8de6e41ca6d7f0863525e87c057ce6cfb..cab0dd958492cd6efeec5c8d25342f99e8e25359 100644 (file)
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -231,8 +231,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
 
        length = skb->len;
        if (length < ETH_ZLEN) {
-               skb = skb_padto(skb, ETH_ZLEN);
-               if (skb == NULL)
+               if (skb_padto(skb, ETH_ZLEN))
                        return 0;
                length = ETH_ZLEN;
        }