From f5855cdfb817e761410bec7f1474913047f2495d Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Wed, 26 Oct 2011 10:55:16 -0400 Subject: [PATCH] --- yaml --- r: 290035 b: refs/heads/master c: 47361c87c504d89f1ba50b4230d56ef67792c258 h: refs/heads/master i: 290033: 236fe101cc0a6ddca5e524f58d55ee30efc1e094 290031: 0523ff2acbe03d6ac99a32c25549ab6dfd2a08ab v: v3 --- [refs] | 2 +- trunk/net/tipc/link.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9bc44efec1d2..ceab2921edf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 934993137199ffb56fef50664f87e71cdb3471b0 +refs/heads/master: 47361c87c504d89f1ba50b4230d56ef67792c258 diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c index 3405f560a84d..1150ba5a648b 100644 --- a/trunk/net/tipc/link.c +++ b/trunk/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: