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.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.c')
-rw-r--r-- | net/ipv4/tcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 4a96f3730170..54ba6209eea9 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1085,7 +1085,7 @@ static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, | |||
1085 | int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | 1085 | int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, |
1086 | size_t size) | 1086 | size_t size) |
1087 | { | 1087 | { |
1088 | struct iovec *iov; | 1088 | const struct iovec *iov; |
1089 | struct tcp_sock *tp = tcp_sk(sk); | 1089 | struct tcp_sock *tp = tcp_sk(sk); |
1090 | struct sk_buff *skb; | 1090 | struct sk_buff *skb; |
1091 | int iovlen, flags, err, copied = 0; | 1091 | int iovlen, flags, err, copied = 0; |
@@ -1136,8 +1136,8 @@ int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
1136 | mss_now = tcp_send_mss(sk, &size_goal, flags); | 1136 | mss_now = tcp_send_mss(sk, &size_goal, flags); |
1137 | 1137 | ||
1138 | /* Ok commence sending. */ | 1138 | /* Ok commence sending. */ |
1139 | iovlen = msg->msg_iovlen; | 1139 | iovlen = msg->msg_iter.nr_segs; |
1140 | iov = msg->msg_iov; | 1140 | iov = msg->msg_iter.iov; |
1141 | copied = 0; | 1141 | copied = 0; |
1142 | 1142 | ||
1143 | err = -EPIPE; | 1143 | err = -EPIPE; |