diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-12-08 12:47:01 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-12-08 12:49:52 +0530 |
| commit | a5233e1b4055da6088f55c36f78b9b1e9b740c18 (patch) | |
| tree | d359aa844d4ced7982434b1ee2ef63b701e8fd25 | |
| parent | 5ded6d4746d34daa12f9bae6a91a58e518672597 (diff) | |
net: PPPoPNS and PPPoLAC build fixes for 4.4tracking-linaro-android-llct-llct-20151208.0
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>
| -rw-r--r-- | drivers/net/ppp/pppolac.c | 4 | ||||
| -rw-r--r-- | drivers/net/ppp/pppopns.c | 4 |
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; |