Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / drivers / net / 82596.c

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index da0c878dcba8a4ee7b63255162834d340115f1cd..8a9f7d61b9b1e51b161a61d3e176b108df403a10 100644 (file)
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1070,8 +1070,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                skb->len, (unsigned int)skb->data));
 
        if (skb->len < ETH_ZLEN) {
-               skb = skb_padto(skb, ETH_ZLEN);
-               if (skb == NULL)
+               if (skb_padto(skb, ETH_ZLEN))
                        return 0;
                length = ETH_ZLEN;
        }