diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /net/x25 | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/af_x25.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 9af3a0e3d..320722c40 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1283,8 +1283,11 @@ void x25_kill_by_neigh(struct x25_neigh *neigh) } } -void __init x25_proto_init(struct net_proto *pro) +static int __init x25_init(void) { +#ifdef MODULE + struct net_device *dev; +#endif /* MODULE */ sock_register(&x25_family_ops); x25_packet_type.type = htons(ETH_P_X25); @@ -1302,20 +1305,8 @@ void __init x25_proto_init(struct net_proto *pro) proc_net_create("x25", 0, x25_get_info); proc_net_create("x25_routes", 0, x25_routes_get_info); #endif -} #ifdef MODULE -EXPORT_NO_SYMBOLS; - -MODULE_AUTHOR("Jonathan Naylor <g4klx@g4klx.demon.co.uk>"); -MODULE_DESCRIPTION("The X.25 Packet Layer network layer protocol"); - -int init_module(void) -{ - struct net_device *dev; - - x25_proto_init(NULL); - /* * Register any pre existing devices. */ @@ -1329,11 +1320,20 @@ int init_module(void) x25_link_device_up(dev); } read_unlock(&dev_base_lock); - +#endif /* MODULE */ return 0; } +module_init(x25_init); + -void cleanup_module(void) + +#ifdef MODULE +EXPORT_NO_SYMBOLS; + +MODULE_AUTHOR("Jonathan Naylor <g4klx@g4klx.demon.co.uk>"); +MODULE_DESCRIPTION("The X.25 Packet Layer network layer protocol"); + +static void __exit x25_exit(void) { #ifdef CONFIG_PROC_FS @@ -1354,7 +1354,7 @@ void cleanup_module(void) sock_unregister(AF_X25); } - +module_exit(x25_exit); #endif #endif |