patch-2.4.0-test10 linux/net/netrom/af_netrom.c

• Lines: 56
• Date: Mon Oct 16 12:42:54 2000
• Orig file: v2.4.0-test9/linux/net/netrom/af_netrom.c
• Orig date: Mon Aug 28 21:16:05 2000

diff -u --recursive --new-file v2.4.0-test9/linux/net/netrom/af_netrom.c linux/net/netrom/af_netrom.c
@@ -1261,13 +1261,13 @@
 
 static struct net_device *dev_nr;
 
-void __init nr_proto_init(struct net_proto *pro)
+static int __init nr_proto_init(void)
 {
 	int i;
 
 	if ((dev_nr = kmalloc(nr_ndevs * sizeof(struct net_device), GFP_KERNEL)) == NULL) {
 		printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n");
-		return;
+		return -1;
 	}
 
 	memset(dev_nr, 0x00, nr_ndevs * sizeof(struct net_device));
@@ -1296,8 +1296,12 @@
 	proc_net_create("nr_neigh", 0, nr_neigh_get_info);
 	proc_net_create("nr_nodes", 0, nr_nodes_get_info);
 #endif	
+	return 0;
 }
 
+module_init(nr_proto_init);
+
+
 #ifdef MODULE
 EXPORT_NO_SYMBOLS;
 
@@ -1307,14 +1311,7 @@
 MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>");
 MODULE_DESCRIPTION("The amateur radio NET/ROM network and transport layer protocol");
 
-int init_module(void)
-{
-	nr_proto_init(NULL);
-
-	return 0;
-}
-
-void cleanup_module(void)
+static void nr_exit(void)
 {
 	int i;
 
@@ -1348,7 +1345,9 @@
 
 	kfree(dev_nr);
 }
+module_exit(nr_exit);
+#endif /* MODULE */
+
 
-#endif
 
 #endif