diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /net/tipc/node.h | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/tipc/node.h')
| -rw-r--r-- | net/tipc/node.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/tipc/node.h b/net/tipc/node.h index 4f15cb40aaa4..0b1c5f8b6996 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h | |||
| @@ -79,8 +79,8 @@ struct tipc_node { | |||
| 79 | struct hlist_node hash; | 79 | struct hlist_node hash; |
| 80 | struct list_head list; | 80 | struct list_head list; |
| 81 | struct list_head nsub; | 81 | struct list_head nsub; |
| 82 | struct link *active_links[2]; | 82 | struct tipc_link *active_links[2]; |
| 83 | struct link *links[MAX_BEARERS]; | 83 | struct tipc_link *links[MAX_BEARERS]; |
| 84 | int link_cnt; | 84 | int link_cnt; |
| 85 | int working_links; | 85 | int working_links; |
| 86 | int block_setup; | 86 | int block_setup; |
| @@ -117,10 +117,10 @@ extern u32 tipc_own_tag; | |||
| 117 | struct tipc_node *tipc_node_find(u32 addr); | 117 | struct tipc_node *tipc_node_find(u32 addr); |
| 118 | struct tipc_node *tipc_node_create(u32 addr); | 118 | struct tipc_node *tipc_node_create(u32 addr); |
| 119 | void tipc_node_delete(struct tipc_node *n_ptr); | 119 | void tipc_node_delete(struct tipc_node *n_ptr); |
| 120 | void tipc_node_attach_link(struct tipc_node *n_ptr, struct link *l_ptr); | 120 | void tipc_node_attach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr); |
| 121 | void tipc_node_detach_link(struct tipc_node *n_ptr, struct link *l_ptr); | 121 | void tipc_node_detach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr); |
| 122 | void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr); | 122 | void tipc_node_link_down(struct tipc_node *n_ptr, struct tipc_link *l_ptr); |
| 123 | void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr); | 123 | void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr); |
| 124 | int tipc_node_active_links(struct tipc_node *n_ptr); | 124 | int tipc_node_active_links(struct tipc_node *n_ptr); |
| 125 | int tipc_node_redundant_links(struct tipc_node *n_ptr); | 125 | int tipc_node_redundant_links(struct tipc_node *n_ptr); |
| 126 | int tipc_node_is_up(struct tipc_node *n_ptr); | 126 | int tipc_node_is_up(struct tipc_node *n_ptr); |