X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fcassini.c;h=b89c7bb2c591a74ca700460d938183022018dece;hb=ba290ab7dace8b3339c0cc86c221d48eed21e956;hp=39f36aa05aa8b005bf4b2b2638ef7f1a47810f6e;hpb=75ac6ae8187d1c2205eb9f55c4a154cb7f4a2f45;p=linux-2.6

diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 39f36aa05a..b89c7bb2c5 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -66,7 +66,6 @@
  * by default, the selective clear mask is set up to process rx packets.  
  */
 
-#include <linux/config.h>
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -2915,8 +2914,7 @@ static int cas_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	 */
 	static int ring; 
 
-	skb = skb_padto(skb, cp->min_frame_size);
-	if (!skb)
+	if (skb_padto(skb, cp->min_frame_size))
 		return 0;
 
 	/* XXX: we need some higher-level QoS hooks to steer packets to