1 files changed, 2 insertions, 2 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 7130e73bd42c..566906795c8c 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1083,7 +1083,7 @@ static int __tipc_sendstream(struct socket *sock, struct msghdr *m, size_t dlen)
                 }
         } while (sent < dlen && !rc);
 
-        return rc ? rc : sent;
+        return sent ? sent : rc;
 }
 
 /**
@@ -1484,7 +1484,7 @@ restart:
         if (unlikely(flags & MSG_PEEK))
                 goto exit;
 
-        tsk->rcv_unacked += tsk_inc(tsk, hlen + sz);
+        tsk->rcv_unacked += tsk_inc(tsk, hlen + msg_data_sz(msg));
         if (unlikely(tsk->rcv_unacked >= (tsk->rcv_win / 4)))
                 tipc_sk_send_ack(tsk);
         tsk_advance_rx_queue(sk);