Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common

[firefly-linux-kernel-4.4.55.git] / drivers / net / ppp / pppopns.c

diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c
index 6016d29c0660c5bbb50e7baf13711a3fb663d6db..568bb45cfeac81ef4063084e605b5fd40b2413b3 100644 (file)
--- a/drivers/net/ppp/pppopns.c
+++ b/drivers/net/ppp/pppopns.c
@@ -169,7 +169,7 @@ drop:
        return NET_RX_DROP;
 }
 
-static void pppopns_recv(struct sock *sk_raw, int length)
+static void pppopns_recv(struct sock *sk_raw)
 {
        struct sk_buff *skb;
        while ((skb = skb_dequeue(&sk_raw->sk_receive_queue))) {
@@ -194,7 +194,7 @@ static void pppopns_xmit_core(struct work_struct *delivery_work)
                        .msg_iovlen = 1,
                        .msg_flags = MSG_NOSIGNAL | MSG_DONTWAIT,
                };
-               sk_raw->sk_prot->sendmsg(NULL, sk_raw, &msg, skb->len);
+               sk_raw->sk_prot->sendmsg(sk_raw, &msg, skb->len);
                kfree_skb(skb);
        }
        set_fs(old_fs);
@@ -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;