1 files changed, 13 insertions, 5 deletions

diff --git a/net/tipc/node.h b/net/tipc/node.h
index 3d18c66b7f78..02d5c20dc551 100644
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -64,7 +64,8 @@ enum {
         TIPC_NOTIFY_LINK_UP             = (1 << 6),
         TIPC_NOTIFY_LINK_DOWN           = (1 << 7),
         TIPC_NAMED_MSG_EVT              = (1 << 8),
-        TIPC_BCAST_MSG_EVT              = (1 << 9)
+        TIPC_BCAST_MSG_EVT              = (1 << 9),
+        TIPC_BCAST_RESET                = (1 << 10)
 };
 
 /**
@@ -84,7 +85,7 @@ struct tipc_node_bclink {
         u32 last_sent;
         u32 oos_state;
         u32 deferred_size;
-        struct sk_buff_head deferred_queue;
+        struct sk_buff_head deferdq;
         struct sk_buff *reasm_buf;
         int inputq_map;
         bool recv_permitted;
@@ -93,6 +94,7 @@ struct tipc_node_bclink {
 /**
  * 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
@@ -106,6 +108,7 @@ struct tipc_node_bclink {
  * @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
@@ -113,6 +116,7 @@ struct tipc_node_bclink {
  */
 struct tipc_node {
         u32 addr;
+        struct kref kref;
         spinlock_t lock;
         struct net *net;
         struct hlist_node hash;
@@ -125,7 +129,8 @@ struct tipc_node {
         struct tipc_node_bclink bclink;
         struct list_head list;
         int link_cnt;
-        int working_links;
+        u16 working_links;
+        u16 capabilities;
         u32 signature;
         u32 link_id;
         struct list_head publ_list;
@@ -134,6 +139,7 @@ struct tipc_node {
 };
 
 struct tipc_node *tipc_node_find(struct net *net, u32 addr);
+void tipc_node_put(struct tipc_node *node);
 struct tipc_node *tipc_node_create(struct net *net, u32 addr);
 void tipc_node_stop(struct net *net);
 void tipc_node_attach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr);
@@ -168,10 +174,12 @@ static inline uint tipc_node_get_mtu(struct net *net, u32 addr, u32 selector)
 
         node = tipc_node_find(net, addr);
 
-        if (likely(node))
+        if (likely(node)) {
                 mtu = node->act_mtus[selector & 1];
-        else
+                tipc_node_put(node);
+        } else {
                 mtu = MAX_MSG_SIZE;
+        }
 
         return mtu;
 }