patch-2.4.0-test10 linux/net/irda/af_irda.c

Next file: linux/net/irda/irmod.c
Previous file: linux/net/ipx/af_ipx.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test9/linux/net/irda/af_irda.c linux/net/irda/af_irda.c
@@ -43,10 +43,10 @@
  ********************************************************************/
 
 #include <linux/config.h>
+#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/sockios.h>
-#include <linux/init.h>
 #include <linux/if_arp.h>
 #include <linux/net.h>
 #include <linux/irda.h>
@@ -2155,17 +2155,19 @@
  *    Initialize IrDA protocol layer
  *
  */
-void __init irda_proto_init(struct net_proto *pro)
+static int __init irda_proto_init(void)
 {
-	sock_register(&irda_family_ops);
-
-	irda_packet_type.type = htons(ETH_P_IRDA);
+        sock_register(&irda_family_ops);
+	
+        irda_packet_type.type = htons(ETH_P_IRDA);
         dev_add_pack(&irda_packet_type);
-
-	register_netdevice_notifier(&irda_dev_notifier);
-
-	irda_init();
+	
+        register_netdevice_notifier(&irda_dev_notifier);
+	
+        irda_init();
+	return 0;
 }
+module_init(irda_proto_init);
 
 /*
  * Function irda_proto_cleanup (void)
@@ -2186,4 +2188,5 @@
 	
         return;
 }
+module_exit(irda_proto_cleanup);
 #endif /* MODULE */

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