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

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

diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index b67545be2caa346fa68e7f90f270a81ce490cf0a..4bf76f86d8e90081f8f796369daeaff0827cfc08 100644 (file)
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -1064,8 +1064,7 @@ static int eth16i_tx(struct sk_buff *skb, struct net_device *dev)
        unsigned long flags;
 
        if (length < ETH_ZLEN) {
-               skb = skb_padto(skb, ETH_ZLEN);
-               if (skb == NULL)
+               if (skb_padto(skb, ETH_ZLEN))
                        return 0;
                length = ETH_ZLEN;
        }