diff options
Diffstat (limited to 'net/tipc/node.h')
-rw-r--r-- | net/tipc/node.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/tipc/node.h b/net/tipc/node.h index 3abaaa24c77d..206a8efa410e 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h | |||
@@ -38,14 +38,14 @@ | |||
38 | #define _TIPC_NODE_H | 38 | #define _TIPC_NODE_H |
39 | 39 | ||
40 | #include "node_subscr.h" | 40 | #include "node_subscr.h" |
41 | #include "cluster.h" | 41 | #include "addr.h" |
42 | #include "net.h" | ||
42 | #include "bearer.h" | 43 | #include "bearer.h" |
43 | 44 | ||
44 | /** | 45 | /** |
45 | * struct tipc_node - TIPC node structure | 46 | * struct tipc_node - TIPC node structure |
46 | * @addr: network address of node | 47 | * @addr: network address of node |
47 | * @lock: spinlock governing access to structure | 48 | * @lock: spinlock governing access to structure |
48 | * @owner: pointer to cluster that node belongs to | ||
49 | * @next: pointer to next node in sorted list of cluster's nodes | 49 | * @next: pointer to next node in sorted list of cluster's nodes |
50 | * @nsub: list of "node down" subscriptions monitoring node | 50 | * @nsub: list of "node down" subscriptions monitoring node |
51 | * @active_links: pointers to active links to node | 51 | * @active_links: pointers to active links to node |
@@ -69,7 +69,6 @@ | |||
69 | struct tipc_node { | 69 | struct tipc_node { |
70 | u32 addr; | 70 | u32 addr; |
71 | spinlock_t lock; | 71 | spinlock_t lock; |
72 | struct cluster *owner; | ||
73 | struct tipc_node *next; | 72 | struct tipc_node *next; |
74 | struct list_head nsub; | 73 | struct list_head nsub; |
75 | struct link *active_links[2]; | 74 | struct link *active_links[2]; |
@@ -108,7 +107,7 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space) | |||
108 | static inline struct tipc_node *tipc_node_find(u32 addr) | 107 | static inline struct tipc_node *tipc_node_find(u32 addr) |
109 | { | 108 | { |
110 | if (likely(in_own_cluster(addr))) | 109 | if (likely(in_own_cluster(addr))) |
111 | return tipc_local_nodes[tipc_node(addr)]; | 110 | return tipc_net.nodes[tipc_node(addr)]; |
112 | return NULL; | 111 | return NULL; |
113 | } | 112 | } |
114 | 113 | ||