tipc: use bearer index when looking up active links

[cascardo/linux.git] / net / tipc / node.h

diff --git a/net/tipc/node.h b/net/tipc/node.h
index 5a834cf..74f278a 100644 (file)
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -45,6 +45,8 @@
 /* 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_WAIT_PEER_LINKS_DOWN: wait to see that peer's links are down
  * TIPC_WAIT_OWN_LINKS_DOWN: wait until peer node is declared down
@@ -85,10 +87,17 @@ struct tipc_node_bclink {
        u32 deferred_size;
        struct sk_buff_head deferdq;
        struct sk_buff *reasm_buf;
-       int inputq_map;
+       struct sk_buff_head namedq;
        bool recv_permitted;
 };
 
+struct tipc_link_entry {
+       struct tipc_link *link;
+       u32 mtu;
+       struct sk_buff_head inputq;
+       struct tipc_media_addr maddr;
+};
+
 /**
  * struct tipc_node - TIPC node structure
  * @addr: network address of node
@@ -98,9 +107,8 @@ struct tipc_node_bclink {
  * @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
- * @curr_link: the link holding the node lock, if any
- * @active_links: pointers to active links to node
- * @links: pointers to all links to node
+ * @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
  * @bclink: broadcast-related info
  * @list: links to adjacent nodes in sorted list of cluster's nodes
@@ -120,9 +128,8 @@ struct tipc_node {
        struct hlist_node hash;
        struct sk_buff_head *inputq;
        struct sk_buff_head *namedq;
-       struct tipc_link *active_links[2];
-       u32 act_mtus[2];
-       struct tipc_link *links[MAX_BEARERS];
+       int active_links[2];
+       struct tipc_link_entry links[MAX_BEARERS];
        int action_flags;
        struct tipc_node_bclink bclink;
        struct list_head list;
@@ -140,12 +147,16 @@ 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_check_dest(struct tipc_node *n, struct tipc_bearer *bearer,
+                         bool *link_up, bool *addr_match,
+                         struct tipc_media_addr *maddr);
+bool tipc_node_update_dest(struct tipc_node *n, struct tipc_bearer *bearer,
+                          struct tipc_media_addr *maddr);
 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);
-void tipc_node_link_down(struct tipc_node *n_ptr, struct tipc_link *l_ptr);
-void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr);
-int tipc_node_active_links(struct tipc_node *n_ptr);
-int tipc_node_is_up(struct tipc_node *n_ptr);
+void tipc_node_link_down(struct tipc_node *n_ptr, int bearer_id);
+void tipc_node_link_up(struct tipc_node *n_ptr, int bearer_id);
+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);
@@ -165,20 +176,30 @@ static inline bool tipc_node_blocked(struct tipc_node *node)
                TIPC_NOTIFY_NODE_DOWN | TIPC_WAIT_OWN_LINKS_DOWN));
 }
 
-static inline uint tipc_node_get_mtu(struct net *net, u32 addr, u32 selector)
+static inline struct tipc_link *node_active_link(struct tipc_node *n, int sel)
 {
-       struct tipc_node *node;
-       u32 mtu;
+       int bearer_id = n->active_links[sel & 1];
 
-       node = tipc_node_find(net, addr);
+       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;
 
-       if (likely(node)) {
-               mtu = node->act_mtus[selector & 1];
-               tipc_node_put(node);
-       } else {
-               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;
 }