From e53b9281547c152bcc327c27142c40e5ab6f08d4 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Mon, 30 May 2011 11:27:50 -0400
Subject: [PATCH] --- yaml --- r: 255919 b: refs/heads/master c:
 8af4638a297b43c4929fdc01456b7f0698de0c0e h: refs/heads/master i:   255917:
 53dfea28b0a3ec18b8f14bf53291af666aba90df   255915:
 3ecbef8e51e5abb095c1caf3a14ede0930d43ea7   255911:
 a1d60146f4c17f3d67e208d446e10c389438df5d   255903:
 6c36b817c685e52eb52641c5e69188a6e5b6ed4e v: v3

---
 [refs]                      | 2 +-
 trunk/net/tipc/name_table.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index bb1c629ca473..04421fc469fc 100644
--- 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
index 7d85cc1ace0e..46e6b6c2ecc9 100644
--- 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);