Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

More work from Al Viro to move away from modifying iovecs
by using iov_iter instead.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 0cbcf98f2cab..8baa53e17a30 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -492,7 +492,7 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
                         goto csum_copy_err;
                 err = skb_copy_datagram_msg(skb, 0, msg, copied);
         } else {
-                err = skb_copy_and_csum_datagram_iovec(skb, 0, msg->msg_iov);
+                err = skb_copy_and_csum_datagram_msg(skb, 0, msg);
                 if (err == -EINVAL)
                         goto csum_copy_err;
         }
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index dbc0b042bdd6..7cfb5d745a2d 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -428,7 +428,7 @@ try_again:
                 err = skb_copy_datagram_msg(skb, sizeof(struct udphdr),
                                             msg, copied);
         else {
-                err = skb_copy_and_csum_datagram_iovec(skb, sizeof(struct udphdr), msg->msg_iov);
+                err = skb_copy_and_csum_datagram_msg(skb, sizeof(struct udphdr), msg);
                 if (err == -EINVAL)
                         goto csum_copy_err;
         }