From 17f594dbfef49cbf5e1493a6f0c21a2a3c8a4405 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Fri, 28 Oct 2011 12:03:00 -0400 Subject: [PATCH] --- yaml --- r: 290044 b: refs/heads/master c: 3175bd9add570f3b5c06877369897b334556a2ff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/tipc/name_distr.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 69876f9cc73e..a0c6725fa038 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63e7f1ac2855ba56f15d8189694ca9bd16ae4107 +refs/heads/master: 3175bd9add570f3b5c06877369897b334556a2ff diff --git a/trunk/net/tipc/name_distr.c b/trunk/net/tipc/name_distr.c index 98ebb37f1808..acecfda82f37 100644 --- a/trunk/net/tipc/name_distr.c +++ b/trunk/net/tipc/name_distr.c @@ -239,9 +239,6 @@ void tipc_named_node_up(unsigned long nodearg) * * Invoked for each publication issued by a newly failed node. * Removes publication structure from name table & deletes it. - * In rare cases the link may have come back up again when this - * function is called, and we have two items representing the same - * publication. Nudge this item's key to distinguish it from the other. */ static void named_purge_publ(struct publication *publ) @@ -249,7 +246,6 @@ static void named_purge_publ(struct publication *publ) struct publication *p; write_lock_bh(&tipc_nametbl_lock); - publ->key += 1222345; p = tipc_nametbl_remove_publ(publ->type, publ->lower, publ->node, publ->ref, publ->key); if (p)