diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
| commit | e47f00743fc4776491344f2c618cc8dc2c23bcbc (patch) | |
| tree | 13e03a113a82a184c51c19c209867cfd3a59b3b9 /net/decnet | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'net/decnet')
| -rw-r--r-- | net/decnet/af_decnet.c | 6 | ||||
| -rw-r--r-- | net/decnet/dn_table.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index ca0850b4a..bc51b636d 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c @@ -2133,6 +2133,9 @@ __setup("decnet=", decnet_setup); static void __exit decnet_exit(void) { + sock_unregister(AF_DECnet); + dev_remove_pack(&dn_dix_packet_type); + #ifdef CONFIG_SYSCTL dn_unregister_sysctl(); #endif /* CONFIG_SYSCTL */ @@ -2148,9 +2151,6 @@ static void __exit decnet_exit(void) #endif /* CONFIG_DECNET_ROUTER */ proc_net_remove("decnet"); - - dev_remove_pack(&dn_dix_packet_type); - sock_unregister(AF_DECnet); } module_init(decnet_init); diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index 2e09a8507..ce7a3ac06 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c @@ -902,6 +902,10 @@ void __init dn_fib_table_init(void) void __exit dn_fib_table_cleanup(void) { + int i; + + for (i = 0; i < DN_NUM_TABLES + 1; ++i) + dn_fib_del_tree(i); + return; } - |