1 files changed, 4 insertions, 5 deletions

diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 9d7d37d95187..3a6a0a7c0759 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -39,7 +39,6 @@
 #include "name_table.h"
 #include "name_distr.h"
 #include "subscr.h"
-#include "port.h"
 
 #define TIPC_NAMETBL_SIZE 1024          /* must be a power of 2 */
 
@@ -262,8 +261,6 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
 
                 /* Lower end overlaps existing entry => need an exact match */
                 if ((sseq->lower != lower) || (sseq->upper != upper)) {
-                        pr_warn("Cannot publish {%u,%u,%u}, overlap error\n",
-                                type, lower, upper);
                         return NULL;
                 }
 
@@ -285,8 +282,6 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
                 /* Fail if upper end overlaps into an existing entry */
                 if ((inspos < nseq->first_free) &&
                     (upper >= nseq->sseqs[inspos].lower)) {
-                        pr_warn("Cannot publish {%u,%u,%u}, overlap error\n",
-                                type, lower, upper);
                         return NULL;
                 }
 
@@ -678,6 +673,8 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
         if (likely(publ)) {
                 table.local_publ_count++;
                 buf = tipc_named_publish(publ);
+                /* Any pending external events? */
+                tipc_named_process_backlog();
         }
         write_unlock_bh(&tipc_nametbl_lock);
 
@@ -699,6 +696,8 @@ int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key)
         if (likely(publ)) {
                 table.local_publ_count--;
                 buf = tipc_named_withdraw(publ);
+                /* Any pending external events? */
+                tipc_named_process_backlog();
                 write_unlock_bh(&tipc_nametbl_lock);
                 list_del_init(&publ->pport_list);
                 kfree(publ);