Merge tag 'ktest-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / raw.c

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 6f08991409c3ad9d3620357d04d1f59005f7e2fa..53ddebc292b68a1f26904070495237b6e9731c3f 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -1050,7 +1050,7 @@ static const struct file_operations raw_seq_fops = {
 
 static __net_init int raw_init_net(struct net *net)
 {
-       if (!proc_net_fops_create(net, "raw", S_IRUGO, &raw_seq_fops))
+       if (!proc_create("raw", S_IRUGO, net->proc_net, &raw_seq_fops))
                return -ENOMEM;
 
        return 0;
@@ -1058,7 +1058,7 @@ static __net_init int raw_init_net(struct net *net)
 
 static __net_exit void raw_exit_net(struct net *net)
 {
-       proc_net_remove(net, "raw");
+       remove_proc_entry("raw", net->proc_net);
 }
 
 static __net_initdata struct pernet_operations raw_net_ops = {