summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2015-12-08 18:26:39 +0530
committerDmitry Shmidt <dimitrysh@google.com>2015-12-08 10:37:51 -0800
commitb8f1ef571f89e753d861f87150feb75f5be61bc4 (patch)
tree811320ab685fcd5f2dc7833de285c1ebb65fd168
parent3494c1937b84ff6cd654aef25b5c803aff69f61d (diff)
downloadomap-omapzoom-p-android-4.1.tar.gz
net: pppopns: pppolac: fix sendmsg function callsp-android-4.1
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>
-rw-r--r--drivers/net/ppp/pppolac.c2
-rw-r--r--drivers/net/ppp/pppopns.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ppp/pppolac.c b/drivers/net/ppp/pppolac.c
index a5d3d634fd9a..a178c863f7cf 100644
--- a/drivers/net/ppp/pppolac.c
+++ b/drivers/net/ppp/pppolac.c
@@ -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);
diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c
index dc15f978c922..55f485a39b88 100644
--- a/drivers/net/ppp/pppopns.c
+++ b/drivers/net/ppp/pppopns.c
@@ -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);