2 files changed, 12 insertions, 7 deletions

diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index 8751ea53dfde..211c1723a190 100644
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -160,6 +160,9 @@ void tipc_named_publish(struct publication *publ)
         list_add_tail(&publ->local_list, &publ_lists[publ->scope]->list);
         publ_lists[publ->scope]->size++;
 
+        if (publ->scope == TIPC_NODE_SCOPE)
+                return;
+
         buf = named_prepare_buf(PUBLICATION, ITEM_SIZE, 0);
         if (!buf) {
                 warn("Publication distribution failure\n");
@@ -183,6 +186,9 @@ void tipc_named_withdraw(struct publication *publ)
         list_del(&publ->local_list);
         publ_lists[publ->scope]->size--;
 
+        if (publ->scope == TIPC_NODE_SCOPE)
+                return;
+
         buf = named_prepare_buf(WITHDRAWAL, ITEM_SIZE, 0);
         if (!buf) {
                 warn("Withdrawal distribution failure\n");
@@ -349,11 +355,11 @@ void tipc_named_recv(struct sk_buff *buf)
 }
 
 /**
- * tipc_named_reinit - re-initialize local publication list
+ * tipc_named_reinit - re-initialize local publications
  *
  * This routine is called whenever TIPC networking is enabled.
- * All existing publications by this node that have "cluster" or "zone" scope
- * are updated to reflect the node's new network address.
+ * All name table entries published by this node are updated to reflect
+ * the node's new network address.
  */
 
 void tipc_named_reinit(void)
@@ -363,7 +369,7 @@ void tipc_named_reinit(void)
 
         write_lock_bh(&tipc_nametbl_lock);
 
-        for (scope = TIPC_ZONE_SCOPE; scope <= TIPC_CLUSTER_SCOPE; scope++)
+        for (scope = TIPC_ZONE_SCOPE; scope <= TIPC_NODE_SCOPE; scope++)
                 list_for_each_entry(publ, &publ_lists[scope]->list, local_list)
                         publ->node = tipc_own_addr;
 
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index c6a1ae36952e..bd80d80fb112 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -698,7 +698,7 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
         table.local_publ_count++;
         publ = tipc_nametbl_insert_publ(type, lower, upper, scope,
                                    tipc_own_addr, port_ref, key);
-        if (publ && (scope != TIPC_NODE_SCOPE))
+        if (likely(publ))
                 tipc_named_publish(publ);
         write_unlock_bh(&tipc_nametbl_lock);
         return publ;
@@ -716,8 +716,7 @@ int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key)
         publ = tipc_nametbl_remove_publ(type, lower, tipc_own_addr, ref, key);
         if (likely(publ)) {
                 table.local_publ_count--;
-                if (publ->scope != TIPC_NODE_SCOPE)
-                        tipc_named_withdraw(publ);
+                tipc_named_withdraw(publ);
                 write_unlock_bh(&tipc_nametbl_lock);
                 list_del_init(&publ->pport_list);
                 kfree(publ);