Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2db8ba65 authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan Committed by Amit Pundir
Browse files

ANDROID: net: pppolac/pppopns: Add back the msg_flags 



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: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
(cherry picked from commit 1f48a715af37ceffd86ee7a5f693dd2ca2dda892)
parent 30156a3c

drivers/net/ppp/pppolac.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/ppp/pppopns.c

+3 −1
Original line number Diff line number Diff line
@@ -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);