Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / net / arm / ether3.c

diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index f1d5b10..0810741 100644 (file)
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -518,8 +518,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev)
 
        length = (length + 1) & ~1;
        if (length != skb->len) {
-               skb = skb_padto(skb, length);
-               if (skb == NULL)
+               if (skb_padto(skb, length))
                        goto out;
        }