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/appletalk | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'net/appletalk')
| -rw-r--r-- | net/appletalk/aarp.c | 12 | ||||
| -rw-r--r-- | net/appletalk/ddp.c | 38 |
2 files changed, 8 insertions, 42 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index 6aba2f14f..392e01c2c 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c @@ -1159,22 +1159,14 @@ void aarp_cleanup_module(void) #ifdef CONFIG_PROC_FS -static struct proc_dir_entry proc_aarp_entries= -{ - PROC_NET_AT_AARP, 4, "aarp", - S_IFREG | S_IRUGO, 1, 0, 0, - 0, &proc_net_inode_operations, - aarp_get_info -}; - void aarp_register_proc_fs(void) { - proc_net_register(&proc_aarp_entries); + proc_net_create("aarp", 0, aarp_get_info); } void aarp_unregister_proc_fs(void) { - proc_net_unregister(PROC_NET_AT_AARP); + proc_net_remove("aarp"); } #endif diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 4ab75098d..b31a46226 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -2069,32 +2069,6 @@ EXPORT_SYMBOL(aarp_send_ddp); EXPORT_SYMBOL(atrtr_get_dev); EXPORT_SYMBOL(atalk_find_dev_addr); -#ifdef CONFIG_PROC_FS -static struct proc_dir_entry proc_appletalk= -{ - PROC_NET_ATALK, 9, "appletalk", - S_IFREG | S_IRUGO, 1, 0, 0, - 0, &proc_net_inode_operations, - atalk_get_info -}; - -static struct proc_dir_entry proc_atalk_route= -{ - PROC_NET_AT_ROUTE, 11,"atalk_route", - S_IFREG | S_IRUGO, 1, 0, 0, - 0, &proc_net_inode_operations, - atalk_rt_get_info -}; - -static struct proc_dir_entry proc_atalk_iface= -{ - PROC_NET_ATIF, 11,"atalk_iface", - S_IFREG | S_IRUGO, 1, 0, 0, - 0, &proc_net_inode_operations, - atalk_if_get_info -}; -#endif /* CONFIG_PROC_FS */ - /* Called by proto.c on kernel start up */ void __init atalk_proto_init(struct net_proto *pro) @@ -2113,9 +2087,9 @@ void __init atalk_proto_init(struct net_proto *pro) aarp_proto_init(); #ifdef CONFIG_PROC_FS - proc_net_register(&proc_appletalk); - proc_net_register(&proc_atalk_route); - proc_net_register(&proc_atalk_iface); + proc_net_create("appletalk", 0, atalk_get_info); + proc_net_create("atalk_route", 0, atalk_rt_get_info); + proc_net_create("atalk_iface", 0, atalk_if_get_info); aarp_register_proc_fs(); #endif /* CONFIG_PROC_FS */ @@ -2155,9 +2129,9 @@ void cleanup_module(void) #endif /* CONFIG_SYSCTL */ #ifdef CONFIG_PROC_FS - proc_net_unregister(PROC_NET_ATALK); - proc_net_unregister(PROC_NET_AT_ROUTE); - proc_net_unregister(PROC_NET_ATIF); + proc_net_remove("appletalk"); + proc_net_remove("atalk_route"); + proc_net_remove("atalk_iface"); aarp_unregister_proc_fs(); #endif /* CONFIG_PROC_FS */ |