X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Feexpress.c;h=33291bcf6d4cc917289184c73e77c4a15f6667ca;hb=09075ef0fd585fb093bb9a6cd1240272114f89cf;hp=82bd356e4f3abf8d2ecf7ff909f8ce4b7bda149f;hpb=603fff54420a0ccc4c3b48bfef43896fb4e33161;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 82bd356e4f3..33291bcf6d4 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -97,7 +97,6 @@
 #define LOCKUP16 0
 #endif
   
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -677,8 +676,7 @@ static int eexp_xmit(struct sk_buff *buf, struct net_device *dev)
 #endif
 
 	if (buf->len < ETH_ZLEN) {
-		buf = skb_padto(buf, ETH_ZLEN);
-		if (buf == NULL)
+		if (skb_padto(buf, ETH_ZLEN))
 			return 0;
 		length = ETH_ZLEN;
 	}