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/decnet/af_decnet.c | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'net/decnet/af_decnet.c')
| -rw-r--r-- | net/decnet/af_decnet.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index aa7759ded..077f3051c 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c @@ -1980,8 +1980,6 @@ static struct packet_type dn_dix_packet_type = NULL, }; -#ifdef CONFIG_PROC_FS - static int dn_get_info(char *buffer, char **start, off_t offset, int length, int dummy) { struct sock *sk; @@ -2036,22 +2034,11 @@ static int dn_get_info(char *buffer, char **start, off_t offset, int length, int return len; } -struct proc_dir_entry decnet_linkinfo = { - PROC_NET_DN_SKT, 6, "decnet", S_IFREG | S_IRUGO, - 1, 0, 0, 0, &proc_net_inode_operations, dn_get_info -}; - #ifdef CONFIG_DECNET_RAW extern int dn_raw_get_info(char *, char **, off_t, int, int); -struct proc_dir_entry decnet_rawinfo = { - PROC_NET_DN_RAW, 10, "decnet_raw", S_IFREG | S_IRUGO, - 1, 0, 0, 0, &proc_net_inode_operations, dn_raw_get_info -}; - #endif /* CONFIG_DECNET_RAW */ -#endif /* CONFIG_PROC_FS */ static struct net_proto_family dn_family_ops = { AF_DECnet, dn_create @@ -2089,11 +2076,9 @@ void __init decnet_proto_init(struct net_proto *pro) dev_add_pack(&dn_dix_packet_type); register_netdevice_notifier(&dn_dev_notifier); -#ifdef CONFIG_PROC_FS - proc_net_register(&decnet_linkinfo); + proc_net_create("decnet", 0, dn_get_info); #ifdef CONFIG_DECNET_RAW - proc_net_register(&decnet_rawinfo); -#endif + proc_net_create("decnet_raw", 0, dn_raw_get_info); #endif dn_dev_init(); dn_neigh_init(); @@ -2222,11 +2207,9 @@ void cleanup_module(void) dn_fib_cleanup(); #endif /* CONFIG_DECNET_ROUTER */ -#ifdef CONFIG_PROC_FS - proc_net_unregister(PROC_NET_DN_SKT); + proc_net_remove("decnet"); #ifdef CONFIG_DECNET_RAW - proc_net_unregister(PROC_NET_DN_RAW); -#endif + proc_net_remove("decnet_raw"); #endif dev_remove_pack(&dn_dix_packet_type); |