patch-2.3.99-pre7 linux/drivers/net/sb1000.c

Next file: linux/drivers/net/shaper.c
Previous file: linux/drivers/net/rcpci45.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/sb1000.c linux/drivers/net/sb1000.c
@@ -1205,9 +1205,8 @@
 MODULE_PARM(io, "1-2i");
 MODULE_PARM(irq, "i");
 
-static char devname[8] = {0, };
 static struct net_device dev_sb1000 = {
-        devname,
+        "",
         0, 0, 0, 0,
         0, 0,
         0, 0, 0, NULL, sb1000_probe };
@@ -1220,8 +1219,8 @@
 {
 	int i;
 	for (i = 0; i < 100; i++) {
-		sprintf(devname, "cm%d", i);
-		if (dev_get(devname) == 0) break;
+		sprintf(dev_sb1000.name, "cm%d", i);
+		if (dev_get(dev_sb1000.name) == 0) break;
 	}
 	if (i == 100) {
 		printk(KERN_ERR "sb1000: can't register any device cm<n>\n");

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)