Merge tag 'mac80211-next-for-davem-2018-03-29' of git://git.kernel.org/pub/scm/linux...

[mirror_ubuntu-eoan-kernel.git] / net / l2tp / l2tp_ppp.c

diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 977bca659787d603713642fa1d7ea79ccb0ca55d..d6deca11da196549546f42d5d6322f92e9232275 100644 (file)
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -1742,7 +1742,7 @@ static __net_init int pppol2tp_init_net(struct net *net)
        struct proc_dir_entry *pde;
        int err = 0;
 
-       pde = proc_create("pppol2tp", S_IRUGO, net->proc_net,
+       pde = proc_create("pppol2tp", 0444, net->proc_net,
                          &pppol2tp_proc_fops);
        if (!pde) {
                err = -ENOMEM;
@@ -1762,7 +1762,6 @@ static struct pernet_operations pppol2tp_net_ops = {
        .init = pppol2tp_init_net,
        .exit = pppol2tp_exit_net,
        .id   = &pppol2tp_net_id,
-       .async = true,
 };
 
 /*****************************************************************************