patch-1.3.19 linux/drivers/net/wavelan.c

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

diff -u --recursive --new-file v1.3.18/linux/drivers/net/wavelan.c linux/drivers/net/wavelan.c
@@ -16,6 +16,7 @@
 #include	<linux/types.h>
 #include	<linux/fcntl.h>
 #include	<linux/interrupt.h>
+#include	<linux/stat.h>
 #include	<linux/ptrace.h>
 #include	<linux/ioport.h>
 #include	<linux/in.h>
@@ -838,9 +839,12 @@
 		{
 			if (wavelan_debug > 0)
 				printk("%s: <-wavelan_probe(): 0\n", dev->name);
-			proc_net_register(&(struct proc_dir_entry)
-					  { PROC_NET_WAVELAN, 7, "wavelan",
-					    wavelan_get_info });
+			proc_net_register(&(struct proc_dir_entry) {
+				PROC_NET_WAVELAN, 7, "wavelan",
+				S_IFREG | S_IRUGO, 1, 0, 0,
+				0, &proc_net_inode_operations,
+				wavelan_get_info
+			});
 
 			return 0;
 		}
@@ -2170,10 +2174,13 @@
 
 #if	defined(MODULE)
 char			kernel_version[]	= UTS_RELEASE;
+static char		devicename[9]		= { 0, };
 static struct device	dev_wavelan		=
 {
-	"       " /* "wavelan" */,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, wavelan_probe
+	devicename, /* device name is inserted by linux/drivers/net/net_init.c */
+	0, 0, 0, 0,
+	0, 0,
+	0, 0, 0, NULL, wavelan_probe
 };
 
 int io = 0x390; /* Default from above.. */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this