tipc: let first message on link be a state message

[karo-tx-linux.git] / net / tipc / node.c

diff --git a/net/tipc/node.c b/net/tipc/node.c
index b00e12cda66c6c0f62a850eec1c9789ff9cfa14f..68d9f7b8485c5eebcf2781a2b5e7f0e64adbc2da 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -545,6 +545,9 @@ static void __tipc_node_link_up(struct tipc_node *n, int bearer_id,
        pr_debug("Established link <%s> on network plane %c\n",
                 tipc_link_name(nl), tipc_link_plane(nl));
 
+       /* Ensure that a STATE message goes first */
+       tipc_link_build_state_msg(nl, xmitq);
+
        /* First link? => give it both slots */
        if (!ol) {
                *slot0 = bearer_id;
@@ -1283,7 +1286,7 @@ static void tipc_node_bc_rcv(struct net *net, struct sk_buff *skb, int bearer_id
        /* Broadcast ACKs are sent on a unicast link */
        if (rc & TIPC_LINK_SND_BC_ACK) {
                tipc_node_read_lock(n);
-               tipc_link_build_ack_msg(le->link, &xmitq);
+               tipc_link_build_state_msg(le->link, &xmitq);
                tipc_node_read_unlock(n);
        }