diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-12-29 20:58:42 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-12-29 21:53:30 -0500 |
commit | a18c4bc3ea3c23f658655b1eee4f62cb71d51efd (patch) | |
tree | 573ab87dd9826f1956bb3a17e481842284ad8321 /net/tipc/node.c | |
parent | 7f9ab6ac2e79b9658eba7c8e3ad8a4392d308057 (diff) |
tipc: rename struct link* to struct tipc_link*
This converts the following:
struct link -> struct tipc_link
struct link_req -> struct tipc_link_req
struct link_name -> struct tipc_link_name
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r-- | net/tipc/node.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index e530de279be9..6b226faad89f 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -136,9 +136,9 @@ void tipc_node_delete(struct tipc_node *n_ptr) | |||
136 | * Link becomes active (alone or shared) or standby, depending on its priority. | 136 | * Link becomes active (alone or shared) or standby, depending on its priority. |
137 | */ | 137 | */ |
138 | 138 | ||
139 | void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr) | 139 | void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr) |
140 | { | 140 | { |
141 | struct link **active = &n_ptr->active_links[0]; | 141 | struct tipc_link **active = &n_ptr->active_links[0]; |
142 | 142 | ||
143 | n_ptr->working_links++; | 143 | n_ptr->working_links++; |
144 | 144 | ||
@@ -171,14 +171,14 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr) | |||
171 | 171 | ||
172 | static void node_select_active_links(struct tipc_node *n_ptr) | 172 | static void node_select_active_links(struct tipc_node *n_ptr) |
173 | { | 173 | { |
174 | struct link **active = &n_ptr->active_links[0]; | 174 | struct tipc_link **active = &n_ptr->active_links[0]; |
175 | u32 i; | 175 | u32 i; |
176 | u32 highest_prio = 0; | 176 | u32 highest_prio = 0; |
177 | 177 | ||
178 | active[0] = active[1] = NULL; | 178 | active[0] = active[1] = NULL; |
179 | 179 | ||
180 | for (i = 0; i < MAX_BEARERS; i++) { | 180 | for (i = 0; i < MAX_BEARERS; i++) { |
181 | struct link *l_ptr = n_ptr->links[i]; | 181 | struct tipc_link *l_ptr = n_ptr->links[i]; |
182 | 182 | ||
183 | if (!l_ptr || !tipc_link_is_up(l_ptr) || | 183 | if (!l_ptr || !tipc_link_is_up(l_ptr) || |
184 | (l_ptr->priority < highest_prio)) | 184 | (l_ptr->priority < highest_prio)) |
@@ -197,9 +197,9 @@ static void node_select_active_links(struct tipc_node *n_ptr) | |||
197 | * tipc_node_link_down - handle loss of link | 197 | * tipc_node_link_down - handle loss of link |
198 | */ | 198 | */ |
199 | 199 | ||
200 | void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr) | 200 | void tipc_node_link_down(struct tipc_node *n_ptr, struct tipc_link *l_ptr) |
201 | { | 201 | { |
202 | struct link **active; | 202 | struct tipc_link **active; |
203 | 203 | ||
204 | n_ptr->working_links--; | 204 | n_ptr->working_links--; |
205 | 205 | ||
@@ -239,14 +239,14 @@ int tipc_node_is_up(struct tipc_node *n_ptr) | |||
239 | return tipc_node_active_links(n_ptr); | 239 | return tipc_node_active_links(n_ptr); |
240 | } | 240 | } |
241 | 241 | ||
242 | void tipc_node_attach_link(struct tipc_node *n_ptr, struct link *l_ptr) | 242 | void tipc_node_attach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr) |
243 | { | 243 | { |
244 | n_ptr->links[l_ptr->b_ptr->identity] = l_ptr; | 244 | n_ptr->links[l_ptr->b_ptr->identity] = l_ptr; |
245 | atomic_inc(&tipc_num_links); | 245 | atomic_inc(&tipc_num_links); |
246 | n_ptr->link_cnt++; | 246 | n_ptr->link_cnt++; |
247 | } | 247 | } |
248 | 248 | ||
249 | void tipc_node_detach_link(struct tipc_node *n_ptr, struct link *l_ptr) | 249 | void tipc_node_detach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr) |
250 | { | 250 | { |
251 | n_ptr->links[l_ptr->b_ptr->identity] = NULL; | 251 | n_ptr->links[l_ptr->b_ptr->identity] = NULL; |
252 | atomic_dec(&tipc_num_links); | 252 | atomic_dec(&tipc_num_links); |
@@ -360,7 +360,7 @@ static void node_lost_contact(struct tipc_node *n_ptr) | |||
360 | 360 | ||
361 | /* Abort link changeover */ | 361 | /* Abort link changeover */ |
362 | for (i = 0; i < MAX_BEARERS; i++) { | 362 | for (i = 0; i < MAX_BEARERS; i++) { |
363 | struct link *l_ptr = n_ptr->links[i]; | 363 | struct tipc_link *l_ptr = n_ptr->links[i]; |
364 | if (!l_ptr) | 364 | if (!l_ptr) |
365 | continue; | 365 | continue; |
366 | l_ptr->reset_checkpoint = l_ptr->next_in_no; | 366 | l_ptr->reset_checkpoint = l_ptr->next_in_no; |