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

More iov_iter work for the networking from Al Viro.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 427aee33ffc0..3075723c729b 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1067,7 +1067,7 @@ static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg,
 int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                 size_t size)
 {
-        struct iovec *iov;
+        const struct iovec *iov;
         struct tcp_sock *tp = tcp_sk(sk);
         struct sk_buff *skb;
         int iovlen, flags, err, copied = 0;
@@ -1118,8 +1118,8 @@ int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
         mss_now = tcp_send_mss(sk, &size_goal, flags);
 
         /* Ok commence sending. */
-        iovlen = msg->msg_iovlen;
-        iov = msg->msg_iov;
+        iovlen = msg->msg_iter.nr_segs;
+        iov = msg->msg_iter.iov;
         copied = 0;
 
         err = -EPIPE;
@@ -1711,7 +1711,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                         if (!user_recv && !(flags & (MSG_TRUNC | MSG_PEEK))) {
                                 user_recv = current;
                                 tp->ucopy.task = user_recv;
-                                tp->ucopy.iov = msg->msg_iov;
+                                tp->ucopy.msg = msg;
                         }
 
                         tp->ucopy.len = len;