X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2F82596.c;h=7e2ca9571467c8e4d9f441c0147537b69371ec35;hb=8431adfd37c306c05abeac8879be7b4e03273a4f;hp=da0c878dcba8a4ee7b63255162834d340115f1cd;hpb=74f5ec29ae93aa42c49f4285c20c457afe937881;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index da0c878dcba..7e2ca957146 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -40,7 +40,6 @@
 
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -1070,8 +1069,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;
 	}