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/x25 | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/af_x25.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 247acd268..c77cb79a7 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1283,21 +1283,6 @@ void x25_kill_by_neigh(struct x25_neigh *neigh) } } -#ifdef CONFIG_PROC_FS -static struct proc_dir_entry proc_net_x25 = { - PROC_NET_X25, 3, "x25", - S_IFREG | S_IRUGO, 1, 0, 0, - 0, &proc_net_inode_operations, - x25_get_info -}; -static struct proc_dir_entry proc_net_x25_routes = { - PROC_NET_X25_ROUTES, 10, "x25_routes", - S_IFREG | S_IRUGO, 1, 0, 0, - 0, &proc_net_inode_operations, - x25_routes_get_info -}; -#endif - void __init x25_proto_init(struct net_proto *pro) { sock_register(&x25_family_ops); @@ -1314,8 +1299,8 @@ void __init x25_proto_init(struct net_proto *pro) #endif #ifdef CONFIG_PROC_FS - proc_net_register(&proc_net_x25); - proc_net_register(&proc_net_x25_routes); + proc_net_create("x25", 0, x25_get_info); + proc_net_create("x25_routes", 0, x25_routes_get_info); #endif } @@ -1352,8 +1337,8 @@ void cleanup_module(void) { #ifdef CONFIG_PROC_FS - proc_net_unregister(PROC_NET_X25); - proc_net_unregister(PROC_NET_X25_ROUTES); + proc_net_remove("x25"); + proc_net_remove("x25_routes"); #endif x25_link_free(); |