patch-2.4.0-test10 linux/drivers/net/pppoe.c

• Lines: 58
• Date: Tue Oct 10 10:33:52 2000
• Orig file: v2.4.0-test9/linux/drivers/net/pppoe.c
• Orig date: Tue Aug 22 08:59:00 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/pppoe.c linux/drivers/net/pppoe.c
@@ -5,7 +5,7 @@
  * PPPoE --- PPP over Ethernet (RFC 2516)
  *
  *
- * Version:    0.6.2
+ * Version:    0.6.3
  *
  * 030700 :     Fixed connect logic to allow for disconnect.
  * 270700 :	Fixed potential SMP problems; we must protect against 
@@ -18,6 +18,8 @@
  *		guards against sock_put not actually freeing the sk 
  *		in pppoe_release.
  *
+ * 051000 :	Initialization cleanup
+ *
  * Author:	Michal Ostrowski <mostrows@styx.uwaterloo.ca>
  * Contributors:
  * 		Arnaldo Carvalho de Melo <acme@conectiva.com.br>
@@ -1025,7 +1027,7 @@
  	int err = register_pppox_proto(PX_PROTO_OE, &pppoe_proto);
 
 	if (err == 0) {
-		printk(KERN_INFO "Registered PPPoE v0.5\n");
+		printk(KERN_INFO "Registered PPPoE v0.6.3\n");
 
 		dev_add_pack(&pppoes_ptype);
 		register_netdevice_notifier(&pppoe_notifier);
@@ -1034,15 +1036,7 @@
 	return err;
 }
 
-
-#ifdef MODULE
-MODULE_PARM(debug, "i");
-int init_module(void)
-{
-	return pppoe_init();
-}
-
-void cleanup_module(void)
+void __exit pppoe_exit(void)
 {
 	unregister_pppox_proto(PX_PROTO_OE);
 	dev_remove_pack(&pppoes_ptype);
@@ -1050,11 +1044,5 @@
 	proc_net_remove("pppoe");
 }
 
-#else
-
-int pppoe_proto_init(struct net_proto *np)
-{
-	return pppoe_init();
-}
-
-#endif
+module_init(pppoe_init);
+module_exit(pppoe_exit);