aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/name_table.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/name_table.c')
-rw-r--r--net/tipc/name_table.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index ea3e94e9d939..205ed4a4e186 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -751,9 +751,8 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
751 table.local_publ_count++; 751 table.local_publ_count++;
752 publ = tipc_nametbl_insert_publ(type, lower, upper, scope, 752 publ = tipc_nametbl_insert_publ(type, lower, upper, scope,
753 tipc_own_addr, port_ref, key); 753 tipc_own_addr, port_ref, key);
754 if (publ && (scope != TIPC_NODE_SCOPE)) { 754 if (publ && (scope != TIPC_NODE_SCOPE))
755 tipc_named_publish(publ); 755 tipc_named_publish(publ);
756 }
757 write_unlock_bh(&tipc_nametbl_lock); 756 write_unlock_bh(&tipc_nametbl_lock);
758 return publ; 757 return publ;
759} 758}
@@ -795,9 +794,8 @@ void tipc_nametbl_subscribe(struct subscription *s)
795 794
796 write_lock_bh(&tipc_nametbl_lock); 795 write_lock_bh(&tipc_nametbl_lock);
797 seq = nametbl_find_seq(type); 796 seq = nametbl_find_seq(type);
798 if (!seq) { 797 if (!seq)
799 seq = tipc_nameseq_create(type, &table.types[hash(type)]); 798 seq = tipc_nameseq_create(type, &table.types[hash(type)]);
800 }
801 if (seq) { 799 if (seq) {
802 spin_lock_bh(&seq->lock); 800 spin_lock_bh(&seq->lock);
803 tipc_nameseq_subscribe(seq, s); 801 tipc_nameseq_subscribe(seq, s);