From 1188cd8e1122301cf81914a4d5cb1c1bce4466f5 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Thu, 3 Nov 2011 11:12:01 -0400
Subject: [PATCH] --- yaml --- r: 290502 b: refs/heads/master c:
 f80c24d9964c8a15c55d1afc2dea327c5eff7d6b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/tipc/name_table.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 70c1888c694b..eeb8eeec403a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c422f1bdc3d3f9f637b3d288a6601668e26111d6
+refs/heads/master: f80c24d9964c8a15c55d1afc2dea327c5eff7d6b
diff --git a/trunk/net/tipc/name_table.c b/trunk/net/tipc/name_table.c
index 1196f050e334..c2224f98e64f 100644
--- a/trunk/net/tipc/name_table.c
+++ b/trunk/net/tipc/name_table.c
@@ -268,6 +268,13 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
 		}
 
 		info = sseq->info;
+
+		/* Check if an identical publication already exists */
+		list_for_each_entry(publ, &info->zone_list, zone_list) {
+			if ((publ->ref == port) && (publ->key == key) &&
+			    (!publ->node || (publ->node == node)))
+				return NULL;
+		}
 	} else {
 		u32 inspos;
 		struct sub_seq *freesseq;