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

Commit 96a33ee7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: pppolac/pppopns: Add back the msg_flags"

parents 06d9001d 3b3ac3a9

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);