1 files changed, 9 insertions, 118 deletions

diff --git a/net/tipc/node.h b/net/tipc/node.h
index 6734562d3c6e..f39d9d06e8bb 100644
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -42,23 +42,6 @@
 #include "bearer.h"
 #include "msg.h"
 
-/* Out-of-range value for node signature */
-#define INVALID_NODE_SIG        0x10000
-
-#define INVALID_BEARER_ID -1
-
-/* Flags used to take different actions according to flag type
- * TIPC_NOTIFY_NODE_DOWN: notify node is down
- * TIPC_NOTIFY_NODE_UP: notify node is up
- * TIPC_DISTRIBUTE_NAME: publish or withdraw link state name type
- */
-enum {
-        TIPC_NOTIFY_NODE_DOWN           = (1 << 3),
-        TIPC_NOTIFY_NODE_UP             = (1 << 4),
-        TIPC_NOTIFY_LINK_UP             = (1 << 6),
-        TIPC_NOTIFY_LINK_DOWN           = (1 << 7)
-};
-
 /* Optional capabilities supported by this code version
  */
 enum {
@@ -66,72 +49,8 @@ enum {
 };
 
 #define TIPC_NODE_CAPABILITIES TIPC_BCAST_SYNCH
+#define INVALID_BEARER_ID -1
 
-struct tipc_link_entry {
-        struct tipc_link *link;
-        u32 mtu;
-        struct sk_buff_head inputq;
-        struct tipc_media_addr maddr;
-};
-
-struct tipc_bclink_entry {
-        struct tipc_link *link;
-        struct sk_buff_head inputq1;
-        struct sk_buff_head arrvq;
-        struct sk_buff_head inputq2;
-        struct sk_buff_head namedq;
-};
-
-/**
- * struct tipc_node - TIPC node structure
- * @addr: network address of node
- * @ref: reference counter to node object
- * @lock: spinlock governing access to structure
- * @net: the applicable net namespace
- * @hash: links to adjacent nodes in unsorted hash chain
- * @inputq: pointer to input queue containing messages for msg event
- * @namedq: pointer to name table input queue with name table messages
- * @active_links: bearer ids of active links, used as index into links[] array
- * @links: array containing references to all links to node
- * @action_flags: bit mask of different types of node actions
- * @state: connectivity state vs peer node
- * @sync_point: sequence number where synch/failover is finished
- * @list: links to adjacent nodes in sorted list of cluster's nodes
- * @working_links: number of working links to node (both active and standby)
- * @link_cnt: number of links to node
- * @capabilities: bitmap, indicating peer node's functional capabilities
- * @signature: node instance identifier
- * @link_id: local and remote bearer ids of changing link, if any
- * @publ_list: list of publications
- * @rcu: rcu struct for tipc_node
- */
-struct tipc_node {
-        u32 addr;
-        struct kref kref;
-        spinlock_t lock;
-        struct net *net;
-        struct hlist_node hash;
-        int active_links[2];
-        struct tipc_link_entry links[MAX_BEARERS];
-        struct tipc_bclink_entry bc_entry;
-        int action_flags;
-        struct list_head list;
-        int state;
-        u16 sync_point;
-        int link_cnt;
-        u16 working_links;
-        u16 capabilities;
-        u32 signature;
-        u32 link_id;
-        struct list_head publ_list;
-        struct list_head conn_sks;
-        unsigned long keepalive_intv;
-        struct timer_list timer;
-        struct rcu_head rcu;
-};
-
-struct tipc_node *tipc_node_find(struct net *net, u32 addr);
-void tipc_node_put(struct tipc_node *node);
 void tipc_node_stop(struct net *net);
 void tipc_node_check_dest(struct net *net, u32 onode,
                           struct tipc_bearer *bearer,
@@ -139,50 +58,22 @@ void tipc_node_check_dest(struct net *net, u32 onode,
                           struct tipc_media_addr *maddr,
                           bool *respond, bool *dupl_addr);
 void tipc_node_delete_links(struct net *net, int bearer_id);
-void tipc_node_attach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr);
-void tipc_node_detach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr);
-bool tipc_node_is_up(struct tipc_node *n);
 int tipc_node_get_linkname(struct net *net, u32 bearer_id, u32 node,
                            char *linkname, size_t len);
-void tipc_node_unlock(struct tipc_node *node);
 int tipc_node_xmit(struct net *net, struct sk_buff_head *list, u32 dnode,
                    int selector);
 int tipc_node_xmit_skb(struct net *net, struct sk_buff *skb, u32 dest,
                        u32 selector);
+void tipc_node_subscribe(struct net *net, struct list_head *subscr, u32 addr);
+void tipc_node_unsubscribe(struct net *net, struct list_head *subscr, u32 addr);
+void tipc_node_broadcast(struct net *net, struct sk_buff *skb);
 int tipc_node_add_conn(struct net *net, u32 dnode, u32 port, u32 peer_port);
 void tipc_node_remove_conn(struct net *net, u32 dnode, u32 port);
+int tipc_node_get_mtu(struct net *net, u32 addr, u32 sel);
 int tipc_nl_node_dump(struct sk_buff *skb, struct netlink_callback *cb);
-
-static inline void tipc_node_lock(struct tipc_node *node)
-{
-        spin_lock_bh(&node->lock);
-}
-
-static inline struct tipc_link *node_active_link(struct tipc_node *n, int sel)
-{
-        int bearer_id = n->active_links[sel & 1];
-
-        if (unlikely(bearer_id == INVALID_BEARER_ID))
-                return NULL;
-
-        return n->links[bearer_id].link;
-}
-
-static inline unsigned int tipc_node_get_mtu(struct net *net, u32 addr, u32 sel)
-{
-        struct tipc_node *n;
-        int bearer_id;
-        unsigned int mtu = MAX_MSG_SIZE;
-
-        n = tipc_node_find(net, addr);
-        if (unlikely(!n))
-                return mtu;
-
-        bearer_id = n->active_links[sel & 1];
-        if (likely(bearer_id != INVALID_BEARER_ID))
-                mtu = n->links[bearer_id].mtu;
-        tipc_node_put(n);
-        return mtu;
-}
+int tipc_nl_node_dump_link(struct sk_buff *skb, struct netlink_callback *cb);
+int tipc_nl_node_reset_link_stats(struct sk_buff *skb, struct genl_info *info);
+int tipc_nl_node_get_link(struct sk_buff *skb, struct genl_info *info);
+int tipc_nl_node_set_link(struct sk_buff *skb, struct genl_info *info);
 
 #endif