github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: net: PPPoPNS and PPPoLAC build fixes for 4.4

Browse Source 
Fix couple of sk_alloc() calls to align with mainline commit
11aa9c28b4 "net: Pass kern from net_proto_family.create to sk_alloc".

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
This commit is contained in:
Amit Pundir 2015-12-08 12:47:01 +05:30 committed by Dmitry Shmidt
parent 028c8d14e9
commit a7e707ed5c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ppp/pppolac.c
View File

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

4
drivers/net/ppp/pppopns.c
View File

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