tipc: Fix problem with broadcast link synchronization between nodes

Corrects a problem in which a link endpoint that activates as the
result of receiving a RESET/STATE sequence of link protocol messages
fails to properly record the broadcast link status information about
the node to which it is now communicating with. (The problem does
not occur with the more common RESET/ACTIVATE sequence of messages.)
The fix ensures that the broadcast link status info is updated after
the RESET message resets the link endpoint, rather than before, thereby
preventing new information from being overwritten by the reset operation.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 3405f560a84d5001891fff8c24d99f740d4c6987..1150ba5a648b336260193520cbe27ef799214ea9 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2105,6 +2105,8 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf)
                        l_ptr->owner->block_setup = WAIT_NODE_DOWN;
                }
 
+               link_state_event(l_ptr, RESET_MSG);
+
                /* fall thru' */
        case ACTIVATE_MSG:
                /* Update link settings according other endpoint's values */
@@ -2134,10 +2136,11 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf)
                if (!tipc_node_is_up(l_ptr->owner))
                        l_ptr->owner->bclink.last_in = msg_last_bcast(msg);
 
-               link_state_event(l_ptr, msg_type(msg));
-
                l_ptr->peer_session = msg_session(msg);
                l_ptr->peer_bearer_id = msg_bearer_id(msg);
+
+               if (msg_type(msg) == ACTIVATE_MSG)
+                       link_state_event(l_ptr, ACTIVATE_MSG);
                break;
        case STATE_MSG: