diff options
Diffstat (limited to 'drivers/net/pppox.c')
| -rw-r--r-- | drivers/net/pppox.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c index f460e16fd..50cdd2fee 100644 --- a/drivers/net/pppox.c +++ b/drivers/net/pppox.c @@ -5,10 +5,12 @@ * PPPoE --- PPP over Ethernet (RFC 2516) * * - * Version: 0.5.0 + * Version: 0.5.1 * * Author: Michal Ostrowski <mostrows@styx.uwaterloo.ca> * + * 051000 : Initialization cleanup + * * License: * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -140,13 +142,7 @@ struct net_proto_family pppox_proto_family = { pppox_create }; -extern int pppoe_init (void); - -#ifdef MODULE -int init_module(void) -#else -int __init pppox_proto_init(struct net_proto *pro) -#endif +int __init pppox_init(void) { int err = 0; @@ -154,19 +150,15 @@ int __init pppox_proto_init(struct net_proto *pro) if (err == 0) { printk(KERN_INFO "Registered PPPoX v0.5\n"); - pppoe_init(); } return err; } -#ifdef MODULE - -MODULE_PARM(debug, "i"); - -void cleanup_module(void) +void __exit pppox_exit(void) { sock_unregister(PF_PPPOX); } -#endif +module_init(pppox_init); +module_exit(pppox_exit); |