linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / lasi_82596.c

diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index 1ab0944..f7b7238 100644 (file)
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -177,7 +177,7 @@ static int i596_debug = (DEB_SERIOUS|DEB_PROBE);
 MODULE_AUTHOR("Richard Hirst");
 MODULE_DESCRIPTION("i82596 driver");
 MODULE_LICENSE("GPL");
-module_param(i596_debug, int, 0);
+MODULE_PARM(i596_debug, "i");
 MODULE_PARM_DESC(i596_debug, "lasi_82596 debug mask");
 
 /* Copy frames shorter than rx_copybreak, otherwise pass on up in
@@ -1083,7 +1083,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                skb->len, skb->data));
 
        if (length < ETH_ZLEN) {
-               if (skb_padto(skb, ETH_ZLEN))
+               skb = skb_padto(skb, ETH_ZLEN);
+               if (skb == NULL)
                        return 0;
                length = ETH_ZLEN;
        }
@@ -1519,9 +1520,9 @@ static void set_multicast_list(struct net_device *dev)
        }
 }
 
-static int debug = -1;
-module_param(debug, int, 0);
+MODULE_PARM(debug, "i");
 MODULE_PARM_DESC(debug, "lasi_82596 debug mask");
+static int debug = -1;
 
 static int num_drivers;
 static struct net_device *netdevs[MAX_DRIVERS];