---

yaml --- r: 255919 b: refs/heads/master c: 8af4638 h: refs/heads/master i: 255917: 53dfea2 255915: 3ecbef8 255911: a1d6014 255903: 6c36b81 v: v3
git-mirror · Jun 24, 2011 · e53b928 · e53b928
1 parent 688878b
commit e53b928
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6f0a4d2d05f758f011a506731e84160d140304b
+refs/heads/master: 8af4638a297b43c4929fdc01456b7f0698de0c0e
diff --git a/trunk/net/tipc/name_table.c b/trunk/net/tipc/name_table.c
@@ -574,14 +574,13 @@ u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode)
 						cluster_list);
 			list_move_tail(&publ->cluster_list,
 				       &info->cluster_list);
-		} else if (!list_empty(&info->zone_list)) {
+		} else {
 			publ = list_first_entry(&info->zone_list,
 						struct publication,
 						zone_list);
 			list_move_tail(&publ->zone_list,
 				       &info->zone_list);
-		} else
-			goto no_match;
+		}
 	}
 
 	/* Round-Robin Algorithm: */
@@ -598,8 +597,6 @@ u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode)
 					cluster_list);
 		list_move_tail(&publ->cluster_list, &info->cluster_list);
 	} else {
-		if (list_empty(&info->zone_list))
-			goto no_match;
 		publ = list_first_entry(&info->zone_list, struct publication,
 					zone_list);
 		list_move_tail(&publ->zone_list, &info->zone_list);