summaryrefslogtreecommitdiff
path: root/drivers/net/ppp
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2015-12-08 12:47:01 +0530
committerJohn Stultz <john.stultz@linaro.org>2016-02-16 13:51:22 -0800
commit4b5ef813e8da57362b18ac8a277ec4432a4e0bfe (patch)
treed4a927461f5ce2f1983ddd751a6c030db7c503b1 /drivers/net/ppp
parent1af89c1ef3b64ef0b58c938e6bcc7d5e3415461b (diff)
net: PPPoPNS and PPPoLAC build fixes for 4.4
Fix couple of sk_alloc() calls to align with mainline commit 11aa9c28b420 "net: Pass kern from net_proto_family.create to sk_alloc". Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'drivers/net/ppp')
-rw-r--r--drivers/net/ppp/pppolac.c4
-rw-r--r--drivers/net/ppp/pppopns.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ppp/pppolac.c b/drivers/net/ppp/pppolac.c
index a178c863f7cf..1b8180cc1d4d 100644
--- a/drivers/net/ppp/pppolac.c
+++ b/drivers/net/ppp/pppolac.c
@@ -396,11 +396,11 @@ static struct proto_ops pppolac_proto_ops = {
.mmap = sock_no_mmap,
};
-static int pppolac_create(struct net *net, struct socket *sock)
+static int pppolac_create(struct net *net, struct socket *sock, int kern)
{
struct sock *sk;
- sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppolac_proto);
+ sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppolac_proto, kern);
if (!sk)
return -ENOMEM;
diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c
index 55f485a39b88..568bb45cfeac 100644
--- a/drivers/net/ppp/pppopns.c
+++ b/drivers/net/ppp/pppopns.c
@@ -375,11 +375,11 @@ static struct proto_ops pppopns_proto_ops = {
.mmap = sock_no_mmap,
};
-static int pppopns_create(struct net *net, struct socket *sock)
+static int pppopns_create(struct net *net, struct socket *sock, int kern)
{
struct sock *sk;
- sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppopns_proto);
+ sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppopns_proto, kern);
if (!sk)
return -ENOMEM;