tipc: remove node subscription infrastructure

The node subscribe infrastructure represents a virtual base class, so
its users, such as struct tipc_port and struct publication, can derive
its implemented functionalities. However, after the removal of struct
tipc_port, struct publication is left as its only single user now. So
defining an abstract infrastructure for one user becomes no longer
reasonable. If corresponding new functions associated with the
infrastructure are moved to name_table.c file, the node subscription
infrastructure can be removed as well.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 82e5edddc376..17b8092f9c40 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -113,7 +113,7 @@ struct tipc_node *tipc_node_create(u32 addr)
         spin_lock_init(&n_ptr->lock);
         INIT_HLIST_NODE(&n_ptr->hash);
         INIT_LIST_HEAD(&n_ptr->list);
-        INIT_LIST_HEAD(&n_ptr->nsub);
+        INIT_LIST_HEAD(&n_ptr->publ_list);
         INIT_LIST_HEAD(&n_ptr->conn_sks);
         __skb_queue_head_init(&n_ptr->waiting_sks);
 
@@ -574,7 +574,7 @@ void tipc_node_unlock(struct tipc_node *node)
                 skb_queue_splice_init(&node->waiting_sks, &waiting_sks);
 
         if (flags & TIPC_NOTIFY_NODE_DOWN) {
-                list_replace_init(&node->nsub, &nsub_list);
+                list_replace_init(&node->publ_list, &nsub_list);
                 list_replace_init(&node->conn_sks, &conn_sks);
         }
         node->action_flags &= ~(TIPC_WAKEUP_USERS | TIPC_NOTIFY_NODE_DOWN |
@@ -591,7 +591,7 @@ void tipc_node_unlock(struct tipc_node *node)
                 tipc_node_abort_sock_conns(&conn_sks);
 
         if (!list_empty(&nsub_list))
-                tipc_nodesub_notify(&nsub_list);
+                tipc_publ_notify(&nsub_list, addr);
 
         if (flags & TIPC_WAKEUP_BCAST_USERS)
                 tipc_bclink_wakeup_users();