diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /net/ipv6/ndisc.c | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'net/ipv6/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 47b6c2c2c..dab819da8 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1179,18 +1179,10 @@ done: return len; } -struct proc_dir_entry ndisc_proc_entry = -{ - PROC_NET_NDISC, 5, "ndisc", - S_IFREG | S_IRUGO, 1, 0, 0, - 0, NULL, - &ndisc_get_info -}; #endif #endif /* CONFIG_PROC_FS */ - int __init ndisc_init(struct net_proto_family *ops) { struct sock *sk; @@ -1230,7 +1222,7 @@ int __init ndisc_init(struct net_proto_family *ops) #ifdef CONFIG_PROC_FS #ifndef CONFIG_RTNETLINK - proc_net_register(&ndisc_proc_entry); + proc_net_create("ndisc", 0, ndisc_get_info); #endif #endif #ifdef CONFIG_SYSCTL @@ -1244,7 +1236,7 @@ void ndisc_cleanup(void) { #ifdef CONFIG_PROC_FS #ifndef CONFIG_RTNETLINK - proc_net_unregister(ndisc_proc_entry.low_ino); + proc_net_remove("ndisc"); #endif #endif neigh_table_clear(&nd_tbl); |