aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/raw.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-11-05 16:46:40 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-05 16:46:40 -0500
commit51f3d02b980a338cd291d2bc7629cdfb2568424b (patch)
treef49898ea87db3d5e3f5c248ab21f6ed0a70785b8 /net/ipv6/raw.c
parent1d76c1d028975df8488d1ae18a76f268eb5efa93 (diff)
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/raw.c')
-rw-r--r--net/ipv6/raw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 075a0fb400e7..0cbcf98f2cab 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -486,11 +486,11 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
486 } 486 }
487 487
488 if (skb_csum_unnecessary(skb)) { 488 if (skb_csum_unnecessary(skb)) {
489 err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); 489 err = skb_copy_datagram_msg(skb, 0, msg, copied);
490 } else if (msg->msg_flags&MSG_TRUNC) { 490 } else if (msg->msg_flags&MSG_TRUNC) {
491 if (__skb_checksum_complete(skb)) 491 if (__skb_checksum_complete(skb))
492 goto csum_copy_err; 492 goto csum_copy_err;
493 err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); 493 err = skb_copy_datagram_msg(skb, 0, msg, copied);
494 } else { 494 } else {
495 err = skb_copy_and_csum_datagram_iovec(skb, 0, msg->msg_iov); 495 err = skb_copy_and_csum_datagram_iovec(skb, 0, msg->msg_iov);
496 if (err == -EINVAL) 496 if (err == -EINVAL)