From e8be419992692518e05e79d51b2aca828a521584 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Fri, 14 Oct 2011 14:42:25 -0400 Subject: [PATCH] --- yaml --- r: 279099 b: refs/heads/master c: 945af1c39df00a1e5873e38145432ba752ec49a0 h: refs/heads/master i: 279097: b6feadd8103369d31b68b5fa345c1ba67799c118 279095: 1192d7ad8164ae4ad2916836b6c5c096f8f94548 v: v3 --- [refs] | 2 +- trunk/net/tipc/name_distr.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b25de7b701b8..cd8b3259efeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97f1b625d133b44d38b8b55ec2cbe35d7ef94f3a +refs/heads/master: 945af1c39df00a1e5873e38145432ba752ec49a0 diff --git a/trunk/net/tipc/name_distr.c b/trunk/net/tipc/name_distr.c index b7ca1bd7b151..be8306f9139e 100644 --- a/trunk/net/tipc/name_distr.c +++ b/trunk/net/tipc/name_distr.c @@ -322,10 +322,9 @@ void tipc_named_recv(struct sk_buff *buf) /** * tipc_named_reinit - re-initialize local publication list * - * This routine is called whenever TIPC networking is (re)enabled. + * This routine is called whenever TIPC networking is enabled. * All existing publications by this node that have "cluster" or "zone" scope - * are updated to reflect the node's current network address. - * (If the node's address is unchanged, the update loop terminates immediately.) + * are updated to reflect the node's new network address. */ void tipc_named_reinit(void) @@ -333,10 +332,9 @@ void tipc_named_reinit(void) struct publication *publ; write_lock_bh(&tipc_nametbl_lock); - list_for_each_entry(publ, &publ_root, local_list) { - if (publ->node == tipc_own_addr) - break; + + list_for_each_entry(publ, &publ_root, local_list) publ->node = tipc_own_addr; - } + write_unlock_bh(&tipc_nametbl_lock); }