diff options
| author | Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> | 2017-04-28 12:53:04 -0600 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-05-01 11:00:59 -0700 |
| commit | 74167dfd4100a5fe377a81e40d43adaf4582abb9 (patch) | |
| tree | e00533de646b9cb8d22b6aa6e5c849d3bca67fc5 | |
| parent | e6342b1d0a706b4c6546b804d1eb6319b3bffae7 (diff) | |
| download | common-android-4.1.tar.gz | |
net: pppolac/pppopns: Add back the msg_flagsdeprecated/android-4.1android-4.1
Commit 26fc40a09221330 ("net: pppolac/pppopns: Replace msg.msg_iov
with iov_iter_kvec()") removed the msg_flags when removing the
iov fields. This lead to problems with VPN data transfers.
Change-Id: Ib86ab3f927c5cf36cbad0bab501575999dc2b084
Fixes: 26fc40a09221330 ("net: pppolac/pppopns: Replace msg.msg_iov with
iov_iter_kvec()")
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
| -rw-r--r-- | drivers/net/ppp/pppolac.c | 4 | ||||
| -rw-r--r-- | drivers/net/ppp/pppopns.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ppp/pppolac.c b/drivers/net/ppp/pppolac.c index ebde922cbc06..a9f9c16cadee 100644 --- a/drivers/net/ppp/pppolac.c +++ b/drivers/net/ppp/pppolac.c @@ -206,7 +206,9 @@ static void pppolac_xmit_core(struct work_struct *delivery_work) while ((skb = skb_dequeue(&delivery_queue))) { struct sock *sk_udp = skb->sk; struct kvec iov = {.iov_base = skb->data, .iov_len = skb->len}; - struct msghdr msg = { 0 }; + struct msghdr msg = { + .msg_flags = MSG_NOSIGNAL | MSG_DONTWAIT, + }; iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iov, 1, skb->len); diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c index ba55f0db8465..e261ab263f22 100644 --- a/drivers/net/ppp/pppopns.c +++ b/drivers/net/ppp/pppopns.c @@ -189,7 +189,9 @@ static void pppopns_xmit_core(struct work_struct *delivery_work) while ((skb = skb_dequeue(&delivery_queue))) { struct sock *sk_raw = skb->sk; struct kvec iov = {.iov_base = skb->data, .iov_len = skb->len}; - struct msghdr msg = { 0 }; + struct msghdr msg = { + .msg_flags = MSG_NOSIGNAL | MSG_DONTWAIT, + }; iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iov, 1, skb->len); |