summaryrefslogtreecommitdiffstats
path: root/net/tipc/node.h
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2014-11-26 11:41:45 +0800
committerDavid S. Miller <davem@davemloft.net>2014-11-26 12:30:16 -0500
commita8f48af587b0f257c49dce5b49a62554a4b8627e (patch)
treedd28b059961d63e1f925a5c34f05fb14a741d405 /net/tipc/node.h
parent73cf0e923d685a6a1b7754c7d29cc14944f271d9 (diff)
downloadtalos-obmc-linux-a8f48af587b0f257c49dce5b49a62554a4b8627e.tar.gz
talos-obmc-linux-a8f48af587b0f257c49dce5b49a62554a4b8627e.zip
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>
Diffstat (limited to 'net/tipc/node.h')
-rw-r--r--net/tipc/node.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/tipc/node.h b/net/tipc/node.h
index 005fbcef3212..f1994511f033 100644
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -37,7 +37,6 @@
#ifndef _TIPC_NODE_H
#define _TIPC_NODE_H
-#include "node_subscr.h"
#include "addr.h"
#include "net.h"
#include "bearer.h"
@@ -104,7 +103,7 @@ struct tipc_node_bclink {
* @link_cnt: number of links to node
* @signature: node instance identifier
* @link_id: local and remote bearer ids of changing link, if any
- * @nsub: list of "node down" subscriptions monitoring node
+ * @publ_list: list of publications
* @rcu: rcu struct for tipc_node
*/
struct tipc_node {
@@ -121,7 +120,7 @@ struct tipc_node {
int working_links;
u32 signature;
u32 link_id;
- struct list_head nsub;
+ struct list_head publ_list;
struct sk_buff_head waiting_sks;
struct list_head conn_sks;
struct rcu_head rcu;
OpenPOWER on IntegriCloud