diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-15 01:16:27 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-24 05:16:41 -0500 |
commit | 45dcc687f764f89e1e7c41dace52b105494e5dbb (patch) | |
tree | 569dd194d3e7107c930da7762330b32f6efdd013 /net/tipc/socket.c | |
parent | 562640f3c3fb64fca24253868dab6e900e305c46 (diff) |
tipc_msg_build(): pass msghdr instead of its ->msg_iov
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 2d4b2fa7d628..b3415a78da2e 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -727,7 +727,7 @@ static int tipc_sendmcast(struct socket *sock, struct tipc_name_seq *seq, | |||
727 | 727 | ||
728 | new_mtu: | 728 | new_mtu: |
729 | mtu = tipc_bclink_get_mtu(); | 729 | mtu = tipc_bclink_get_mtu(); |
730 | rc = tipc_msg_build(mhdr, msg->msg_iov, 0, dsz, mtu, &buf); | 730 | rc = tipc_msg_build(mhdr, msg, 0, dsz, mtu, &buf); |
731 | if (unlikely(rc < 0)) | 731 | if (unlikely(rc < 0)) |
732 | return rc; | 732 | return rc; |
733 | 733 | ||
@@ -905,7 +905,6 @@ static int tipc_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
905 | struct sock *sk = sock->sk; | 905 | struct sock *sk = sock->sk; |
906 | struct tipc_sock *tsk = tipc_sk(sk); | 906 | struct tipc_sock *tsk = tipc_sk(sk); |
907 | struct tipc_msg *mhdr = &tsk->phdr; | 907 | struct tipc_msg *mhdr = &tsk->phdr; |
908 | struct iovec *iov = m->msg_iov; | ||
909 | u32 dnode, dport; | 908 | u32 dnode, dport; |
910 | struct sk_buff *buf; | 909 | struct sk_buff *buf; |
911 | struct tipc_name_seq *seq = &dest->addr.nameseq; | 910 | struct tipc_name_seq *seq = &dest->addr.nameseq; |
@@ -982,7 +981,7 @@ static int tipc_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
982 | 981 | ||
983 | new_mtu: | 982 | new_mtu: |
984 | mtu = tipc_node_get_mtu(dnode, tsk->ref); | 983 | mtu = tipc_node_get_mtu(dnode, tsk->ref); |
985 | rc = tipc_msg_build(mhdr, iov, 0, dsz, mtu, &buf); | 984 | rc = tipc_msg_build(mhdr, m, 0, dsz, mtu, &buf); |
986 | if (rc < 0) | 985 | if (rc < 0) |
987 | goto exit; | 986 | goto exit; |
988 | 987 | ||
@@ -1094,7 +1093,7 @@ static int tipc_send_stream(struct kiocb *iocb, struct socket *sock, | |||
1094 | next: | 1093 | next: |
1095 | mtu = tsk->max_pkt; | 1094 | mtu = tsk->max_pkt; |
1096 | send = min_t(uint, dsz - sent, TIPC_MAX_USER_MSG_SIZE); | 1095 | send = min_t(uint, dsz - sent, TIPC_MAX_USER_MSG_SIZE); |
1097 | rc = tipc_msg_build(mhdr, m->msg_iov, sent, send, mtu, &buf); | 1096 | rc = tipc_msg_build(mhdr, m, sent, send, mtu, &buf); |
1098 | if (unlikely(rc < 0)) | 1097 | if (unlikely(rc < 0)) |
1099 | goto exit; | 1098 | goto exit; |
1100 | do { | 1099 | do { |