From: Amit Pundir <amit.pundir@linaro.org>
Date: Tue, 8 Dec 2015 07:17:01 +0000 (+0530)
Subject: net: PPPoPNS and PPPoLAC build fixes for 4.4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4b5ef813e8da57362b18ac8a277ec4432a4e0bfe;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

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;