diff options
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 6cc7ddd2fb7c..d224382d8270 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -622,13 +622,11 @@ static int send_msg(struct kiocb *iocb, struct socket *sock, | |||
622 | res = tipc_send2name(tport->ref, | 622 | res = tipc_send2name(tport->ref, |
623 | &dest->addr.name.name, | 623 | &dest->addr.name.name, |
624 | dest->addr.name.domain, | 624 | dest->addr.name.domain, |
625 | m->msg_iovlen, | ||
626 | m->msg_iov, | 625 | m->msg_iov, |
627 | total_len); | 626 | total_len); |
628 | } else if (dest->addrtype == TIPC_ADDR_ID) { | 627 | } else if (dest->addrtype == TIPC_ADDR_ID) { |
629 | res = tipc_send2port(tport->ref, | 628 | res = tipc_send2port(tport->ref, |
630 | &dest->addr.id, | 629 | &dest->addr.id, |
631 | m->msg_iovlen, | ||
632 | m->msg_iov, | 630 | m->msg_iov, |
633 | total_len); | 631 | total_len); |
634 | } else if (dest->addrtype == TIPC_ADDR_MCAST) { | 632 | } else if (dest->addrtype == TIPC_ADDR_MCAST) { |
@@ -641,7 +639,6 @@ static int send_msg(struct kiocb *iocb, struct socket *sock, | |||
641 | break; | 639 | break; |
642 | res = tipc_multicast(tport->ref, | 640 | res = tipc_multicast(tport->ref, |
643 | &dest->addr.nameseq, | 641 | &dest->addr.nameseq, |
644 | m->msg_iovlen, | ||
645 | m->msg_iov, | 642 | m->msg_iov, |
646 | total_len); | 643 | total_len); |
647 | } | 644 | } |
@@ -707,8 +704,7 @@ static int send_packet(struct kiocb *iocb, struct socket *sock, | |||
707 | break; | 704 | break; |
708 | } | 705 | } |
709 | 706 | ||
710 | res = tipc_send(tport->ref, m->msg_iovlen, m->msg_iov, | 707 | res = tipc_send(tport->ref, m->msg_iov, total_len); |
711 | total_len); | ||
712 | if (likely(res != -ELINKCONG)) | 708 | if (likely(res != -ELINKCONG)) |
713 | break; | 709 | break; |
714 | if (timeout_val <= 0L) { | 710 | if (timeout_val <= 0L) { |