diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-24 10:42:55 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-09 16:29:03 -0500 |
commit | c0371da6047abd261bc483c744dbc7d81a116172 (patch) | |
tree | 73b4d685f311a83e04f3a684ce18225b409b3f5f /net/ipv4/tcp_output.c | |
parent | d838df2e5dcbb6ed4d82854869e9a30f9aeef6da (diff) |
put iov_iter into msghdr
Note that the code _using_ ->msg_iter at that point will be very
unhappy with anything other than unshifted iovec-backed iov_iter.
We still need to convert users to proper primitives.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index f5bd4bd3f7e6..3e225b03eb95 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -3050,7 +3050,7 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn) | |||
3050 | syn_data->ip_summed = CHECKSUM_PARTIAL; | 3050 | syn_data->ip_summed = CHECKSUM_PARTIAL; |
3051 | memcpy(syn_data->cb, syn->cb, sizeof(syn->cb)); | 3051 | memcpy(syn_data->cb, syn->cb, sizeof(syn->cb)); |
3052 | if (unlikely(memcpy_fromiovecend(skb_put(syn_data, space), | 3052 | if (unlikely(memcpy_fromiovecend(skb_put(syn_data, space), |
3053 | fo->data->msg_iov, 0, space))) { | 3053 | fo->data->msg_iter.iov, 0, space))) { |
3054 | kfree_skb(syn_data); | 3054 | kfree_skb(syn_data); |
3055 | goto fallback; | 3055 | goto fallback; |
3056 | } | 3056 | } |