Merge branch 'x86/urgent' into x86/cache, to pick up dependent fix

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 3f03ddd0e35b..b6f99b021d09 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1419,8 +1419,10 @@ static int __tipc_sendstream(struct socket *sock, struct msghdr *m, size_t dlen)
         /* Handle implicit connection setup */
         if (unlikely(dest)) {
                 rc = __tipc_sendmsg(sock, m, dlen);
-                if (dlen && (dlen == rc))
+                if (dlen && dlen == rc) {
+                        tsk->peer_caps = tipc_node_get_capabilities(net, dnode);
                         tsk->snt_unacked = tsk_inc(tsk, dlen + msg_hdr_sz(hdr));
+                }
                 return rc;
         }