Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tipc_sendmsg(): pass msghdr instead of its ->msg_iov

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 562640f3 e0eb093e

+4 -4
+4 -4
net/tipc/socket.c
··· 700 700 * tipc_sendmcast - send multicast message 701 701 * @sock: socket structure 702 702 * @seq: destination address 703 - * @iov: message data to send 703 + * @msg: message to send 704 704 * @dsz: total length of message data 705 705 * @timeo: timeout to wait for wakeup 706 706 * ··· 708 708 * Returns the number of bytes sent on success, or errno 709 709 */ 710 710 static int tipc_sendmcast(struct socket *sock, struct tipc_name_seq *seq, 711 - struct iovec *iov, size_t dsz, long timeo) 711 + struct msghdr *msg, size_t dsz, long timeo) 712 712 { 713 713 struct sock *sk = sock->sk; 714 714 struct tipc_msg *mhdr = &tipc_sk(sk)->phdr; ··· 727 727 728 728 new_mtu: 729 729 mtu = tipc_bclink_get_mtu(); 730 - rc = tipc_msg_build(mhdr, iov, 0, dsz, mtu, &buf); 730 + rc = tipc_msg_build(mhdr, msg->msg_iov, 0, dsz, mtu, &buf); 731 731 if (unlikely(rc < 0)) 732 732 return rc; 733 733 ··· 951 951 timeo = sock_sndtimeo(sk, m->msg_flags & MSG_DONTWAIT); 952 952 953 953 if (dest->addrtype == TIPC_ADDR_MCAST) { 954 - rc = tipc_sendmcast(sock, seq, iov, dsz, timeo); 954 + rc = tipc_sendmcast(sock, seq, m, dsz, timeo); 955 955 goto exit; 956 956 } else if (dest->addrtype == TIPC_ADDR_NAME) { 957 957 u32 type = dest->addr.name.name.type;