---

yaml --- r: 290044 b: refs/heads/master c: 3175bd9 h: refs/heads/master v: v3
git-mirror · Feb 6, 2012 · 17f594d · 17f594d
1 parent 6167cdf
commit 17f594d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -239,17 +239,13 @@ 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)
 {
 	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)