Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 3ac047bc727d0f3c4cce4c68bf3336c19586289e..a7c089df66e6e0a0619e4f28b4a3fd05f9f9c6d8 100644 (file)
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -544,8 +544,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev)
                printk(KERN_DEBUG "%s: ZNet_send_packet.\n", dev->name);
 
        if (length < ETH_ZLEN) {
-               skb = skb_padto(skb, ETH_ZLEN);
-               if (skb == NULL)
+               if (skb_padto(skb, ETH_ZLEN))
                        return 0;
                length = ETH_ZLEN;
        }