Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[mirror_ubuntu-zesty-kernel.git] / net / tipc / node.h

diff --git a/net/tipc/node.h b/net/tipc/node.h
index 29f7ae6992d4db861c5676aab59589f1a92223b8..a07cc79ea63719f2aaec8737aee2b59153789cc9 100644 (file)
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -51,6 +51,7 @@
  * @nsub: list of "node down" subscriptions monitoring node
  * @active_links: pointers to active links to node
  * @links: pointers to all links to node
+ * @working_links: number of working links to node (both active and standby)
  * @link_cnt: number of links to node
  * @permit_changeover: non-zero if node has redundant links to this system
  * @routers: bitmap (used for multicluster communication)
@@ -76,6 +77,7 @@ struct node {
        struct link *active_links[2];
        struct link *links[MAX_BEARERS];
        int link_cnt;
+       int working_links;
        int permit_changeover;
        u32 routers[512/32];
        int last_router;
@@ -121,7 +123,7 @@ static inline struct node *tipc_node_find(u32 addr)
                if (c_ptr)
                        return c_ptr->nodes[tipc_node(addr)];
        }
-       return 0;
+       return NULL;
 }
 
 static inline struct node *tipc_node_select(u32 addr, u32 selector)