| commit | f4362a2c9524678f0459cf410403f8595e5cfce5 | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Mon Nov 24 13:26:06 2014 -0500 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Tue Dec 09 16:28:22 2014 -0500 |
| tree | 6b112cb41a3c4c6b444f7c8aac77ad96e48e91b2 | |
| parent | f69e6d131f5dac8278ac79a902cc448364880d8b [diff] [blame] |
switch tcp_sock->ucopy from iovec (ucopy.iov) to msghdr (ucopy.msg) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index dc13a36..4a96f37 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c
@@ -1729,7 +1729,7 @@ 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;