From 236fe101cc0a6ddca5e524f58d55ee30efc1e094 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Tue, 25 Oct 2011 12:19:05 -0400 Subject: [PATCH] --- yaml --- r: 290033 b: refs/heads/master c: 4d75313ce9b832efc4efb487f080b5ed72beae2c h: refs/heads/master i: 290031: 0523ff2acbe03d6ac99a32c25549ab6dfd2a08ab v: v3 --- [refs] | 2 +- trunk/net/tipc/link.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 181ca7046ce2..171403753474 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92d2c905b404d8d056ce35a0ce645e23529742c2 +refs/heads/master: 4d75313ce9b832efc4efb487f080b5ed72beae2c diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c index bee316ce387c..4ea6cad11746 100644 --- a/trunk/net/tipc/link.c +++ b/trunk/net/tipc/link.c @@ -2128,14 +2128,15 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf) } l_ptr->owner->bclink.supported = (max_pkt_info != 0); + /* Synchronize broadcast link info, if not done previously */ + + 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); - - /* Synchronize broadcast sequence numbers */ - if (!tipc_node_redundant_links(l_ptr->owner)) - l_ptr->owner->bclink.last_in = mod(msg_last_bcast(msg)); break; case STATE_MSG: