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 a178c863f7cf812ce5714a447b87983909400470..1b8180cc1d4d85db07b9abae1cc4c00dd455f449 100644 (file)
--- 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 55f485a39b88d4c061d36b976d8fdf11ad121e16..568bb45cfeac81ef4063084e605b5fd40b2413b3 100644 (file)
--- 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;