aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ppp/pptp.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ppp/pptp.c')
-rw-r--r--drivers/net/ppp/pptp.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index e3bfbd4d0136..686f37daa262 100644
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -28,8 +28,6 @@
28#include <linux/file.h> 28#include <linux/file.h>
29#include <linux/in.h> 29#include <linux/in.h>
30#include <linux/ip.h> 30#include <linux/ip.h>
31#include <linux/netfilter.h>
32#include <linux/netfilter_ipv4.h>
33#include <linux/rcupdate.h> 31#include <linux/rcupdate.h>
34#include <linux/spinlock.h> 32#include <linux/spinlock.h>
35 33
@@ -561,14 +559,14 @@ static void pptp_sock_destruct(struct sock *sk)
561 skb_queue_purge(&sk->sk_receive_queue); 559 skb_queue_purge(&sk->sk_receive_queue);
562} 560}
563 561
564static int pptp_create(struct net *net, struct socket *sock) 562static int pptp_create(struct net *net, struct socket *sock, int kern)
565{ 563{
566 int error = -ENOMEM; 564 int error = -ENOMEM;
567 struct sock *sk; 565 struct sock *sk;
568 struct pppox_sock *po; 566 struct pppox_sock *po;
569 struct pptp_opt *opt; 567 struct pptp_opt *opt;
570 568
571 sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pptp_sk_proto); 569 sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pptp_sk_proto, kern);
572 if (!sk) 570 if (!sk)
573 goto out; 571 goto out;
574 572