[NET]: Make /proc/net per network namespace

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / netrom / af_netrom.c

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 5d66490dd290a07a7c989465ee5b21c98aed2a83..15c8a92bd7193bc6d19d386fadeb6a23815f2c51 100644 (file)
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -27,6 +27,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -720,7 +721,7 @@ static int nr_connect(struct socket *sock, struct sockaddr *uaddr,
 
                for (;;) {
                        prepare_to_wait(sk->sk_sleep, &wait,
-                                       TASK_INTERRUPTIBLE);
+                                       TASK_INTERRUPTIBLE);
                        if (sk->sk_state != TCP_SYN_SENT)
                                break;
                        if (!signal_pending(current)) {
@@ -1447,9 +1448,9 @@ static int __init nr_proto_init(void)
 
        nr_loopback_init();
 
-       proc_net_fops_create("nr", S_IRUGO, &nr_info_fops);
-       proc_net_fops_create("nr_neigh", S_IRUGO, &nr_neigh_fops);
-       proc_net_fops_create("nr_nodes", S_IRUGO, &nr_nodes_fops);
+       proc_net_fops_create(&init_net, "nr", S_IRUGO, &nr_info_fops);
+       proc_net_fops_create(&init_net, "nr_neigh", S_IRUGO, &nr_neigh_fops);
+       proc_net_fops_create(&init_net, "nr_nodes", S_IRUGO, &nr_nodes_fops);
 out:
        return rc;
 fail:
@@ -1477,9 +1478,9 @@ static void __exit nr_exit(void)
 {
        int i;
 
-       proc_net_remove("nr");
-       proc_net_remove("nr_neigh");
-       proc_net_remove("nr_nodes");
+       proc_net_remove(&init_net, "nr");
+       proc_net_remove(&init_net, "nr_neigh");
+       proc_net_remove(&init_net, "nr_nodes");
        nr_loopback_clear();
 
        nr_rt_free();