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

Commit f69e6d13 authored by Al Viro's avatar Al Viro
Browse files

ip_generic_getfrag, udplite_getfrag: switch to passing msghdr 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 19e3c66b

include/net/udplite.h

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ extern struct udp_table udplite_table; 
static __inline__ int udplite_getfrag(void *from, char *to, int  offset,

				      int len, int odd, struct sk_buff *skb)

{

	return memcpy_fromiovecend(to, (struct iovec *) from, offset, len);

	struct msghdr *msg = from;

	return memcpy_fromiovecend(to, msg->msg_iov, offset, len);

}



/* Designate sk as UDP-Lite socket */

net/ipv4/ip_output.c

+3 −3
Original line number Diff line number Diff line
@@ -752,14 +752,14 @@ EXPORT_SYMBOL(ip_fragment); 
int

ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb)

{

	struct iovec *iov = from;

	struct msghdr *msg = from;



	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		if (memcpy_fromiovecend(to, iov, offset, len) < 0)

		if (memcpy_fromiovecend(to, msg->msg_iov, offset, len) < 0)

			return -EFAULT;

	} else {

		__wsum csum = 0;

		if (csum_partial_copy_fromiovecend(to, iov, offset, len, &csum) < 0)

		if (csum_partial_copy_fromiovecend(to, msg->msg_iov, offset, len, &csum) < 0)

			return -EFAULT;

		skb->csum = csum_block_add(skb->csum, csum, odd);

	}

net/ipv4/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static int raw_getfrag(void *from, char *to, int offset, int len, int odd, 


	offset -= rfv->hlen;



	return ip_generic_getfrag(rfv->msg->msg_iov, to, offset, len, odd, skb);

	return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb);

}



static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,

net/ipv4/udp.c

+2 −2
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 


	/* Lockless fast path for the non-corking case. */

	if (!corkreq) {

		skb = ip_make_skb(sk, fl4, getfrag, msg->msg_iov, ulen,

		skb = ip_make_skb(sk, fl4, getfrag, msg, ulen,

				  sizeof(struct udphdr), &ipc, &rt,

				  msg->msg_flags);

		err = PTR_ERR(skb);
@@ -1080,7 +1080,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 


do_append_data:

	up->len += ulen;

	err = ip_append_data(sk, fl4, getfrag, msg->msg_iov, ulen,

	err = ip_append_data(sk, fl4, getfrag, msg, ulen,

			     sizeof(struct udphdr), &ipc, &rt,

			     corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags);

	if (err)

net/ipv6/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ static int raw6_getfrag(void *from, char *to, int offset, int len, int odd, 


	offset -= rfv->hlen;



	return ip_generic_getfrag(rfv->msg->msg_iov, to, offset, len, odd, skb);

	return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb);

}



static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,