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

Commit 9079f248 authored by Guenter Roeck's avatar Guenter Roeck Committed by Dmitry Shmidt
Browse files

ANDROID: net: pppolac/pppopns: Replace msg.msg_iov with iov_iter_kvec() 



Commit 1af89c1ef3b6 ("Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1")
fixed the build for PPPoPNS and PPPoLAC by re-introducing a field in
struct msghdr which was removed upstream. Re-introducing the field doesn't
get it used, so it is quite likely that the code never worked. Fix it up for
good.

Fixes: 1af89c1ef3b6 ("Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1")
Signed-off-by: default avatarGuenter Roeck <groeck@chromium.org>
parent 4a623fb5

drivers/net/ppp/pppolac.c

+4 −5
Original line number Diff line number Diff line
@@ -206,11 +206,10 @@ 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 = {

			.msg_iov = (struct iovec *)&iov,

			.msg_iovlen = 1,

			.msg_flags = MSG_NOSIGNAL | MSG_DONTWAIT,

		};

		struct msghdr msg = { 0 };



		iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iov, 1,

			      skb->len);

		sk_udp->sk_prot->sendmsg(sk_udp, &msg, skb->len);

		kfree_skb(skb);

	}

drivers/net/ppp/pppopns.c

+4 −5
Original line number Diff line number Diff line
@@ -189,11 +189,10 @@ 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 = {

			.msg_iov = (struct iovec *)&iov,

			.msg_iovlen = 1,

			.msg_flags = MSG_NOSIGNAL | MSG_DONTWAIT,

		};

		struct msghdr msg = { 0 };



		iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iov, 1,

			      skb->len);

		sk_raw->sk_prot->sendmsg(sk_raw, &msg, skb->len);

		kfree_skb(skb);

	}

include/linux/socket.h

+0 −4
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ struct linger { 
struct msghdr {

	void		*msg_name;	/* ptr to socket address structure */

	int		msg_namelen;	/* size of socket address structure */

#if defined(CONFIG_PPPOLAC) || defined(CONFIG_PPPOPNS)

	struct iovec	*msg_iov;	/* scatter/gather array */

	__kernel_size_t	msg_iovlen;	/* # elements in msg_iov */

#endif

	struct iov_iter	msg_iter;	/* data */

	void		*msg_control;	/* ancillary data */

	__kernel_size_t	msg_controllen;	/* ancillary data buffer length */