OSDN Git Service

ANDROID: net: pppopns: pppolac: fix sendmsg function calls
authorAmit Pundir <amit.pundir@linaro.org>
Tue, 8 Dec 2015 12:56:39 +0000 (18:26 +0530)
committerDmitry Shmidt <dimitrysh@google.com>
Thu, 19 Jan 2017 21:32:07 +0000 (13:32 -0800)
Fix couple of sendmsg() calls to align with changes
from upstream commit 1b784140474e "net: Remove iocb
argument from sendmsg and recvmsg".

Change-Id: I85bc46130af8decfa37abe65aec33053ed39f1b1
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
drivers/net/ppp/pppolac.c
drivers/net/ppp/pppopns.c

index a5d3d63..a178c86 100644 (file)
@@ -211,7 +211,7 @@ static void pppolac_xmit_core(struct work_struct *delivery_work)
                        .msg_iovlen = 1,
                        .msg_flags = MSG_NOSIGNAL | MSG_DONTWAIT,
                };
-               sk_udp->sk_prot->sendmsg(NULL, sk_udp, &msg, skb->len);
+               sk_udp->sk_prot->sendmsg(sk_udp, &msg, skb->len);
                kfree_skb(skb);
        }
        set_fs(old_fs);
index dc15f97..55f485a 100644 (file)
@@ -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);