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

Commit 51f3d02b authored by David S. Miller's avatar David S. Miller
Browse files

net: Add and use skb_copy_datagram_msg() helper. 



This encapsulates all of the skb_copy_datagram_iovec() callers
with call argument signature "skb, offset, msghdr->msg_iov, length".

When we move to iov_iters in the networking, the iov_iter object will
sit in the msghdr.

Having a helper like this means there will be less places to touch
during that transformation.

Based upon descriptions and patch from Al Viro.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d76c1d0

drivers/isdn/mISDN/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock, 
	memcpy(skb_push(skb, MISDN_HEADER_LEN), mISDN_HEAD_P(skb),

	       MISDN_HEADER_LEN);



	err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);

	err = skb_copy_datagram_msg(skb, 0, msg, copied);



	mISDN_sock_cmsg(sk, msg, skb);

drivers/net/ppp/pppoe.c

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock, 


	if (skb) {

		total_len = min_t(size_t, total_len, skb->len);

		error = skb_copy_datagram_iovec(skb, 0, m->msg_iov, total_len);

		error = skb_copy_datagram_msg(skb, 0, m, total_len);

		if (error == 0) {

			consume_skb(skb);

			return total_len;

include/linux/skbuff.h

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/bug.h>

#include <linux/cache.h>

#include <linux/rbtree.h>

#include <linux/socket.h>



#include <linux/atomic.h>

#include <asm/types.h>
@@ -2639,6 +2640,11 @@ unsigned int datagram_poll(struct file *file, struct socket *sock, 
			   struct poll_table_struct *wait);

int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,

			    struct iovec *to, int size);

static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,

					struct msghdr *msg, int size)

{

	return skb_copy_datagram_iovec(from, offset, msg->msg_iov, size);

}

int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,

				     struct iovec *iov);

int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset,

net/appletalk/ddp.c

+1 −1
Original line number Diff line number Diff line
@@ -1758,7 +1758,7 @@ static int atalk_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr 
		copied = size;

		msg->msg_flags |= MSG_TRUNC;

	}

	err = skb_copy_datagram_iovec(skb, offset, msg->msg_iov, copied);

	err = skb_copy_datagram_msg(skb, offset, msg, copied);



	if (!err && msg->msg_name) {

		DECLARE_SOCKADDR(struct sockaddr_at *, sat, msg->msg_name);

net/atm/common.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 
		msg->msg_flags |= MSG_TRUNC;

	}



	error = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);

	error = skb_copy_datagram_msg(skb, 0, msg, copied);

	if (error)

		return error;

	sock_recv_ts_and_drops(msg, sk, skb);