diff options
author | Ying Xue <ying.xue@windriver.com> | 2014-02-13 17:29:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-13 17:57:05 -0500 |
commit | e0ca2c30b1e9c1ed8b58bccb95c33d25763a4311 (patch) | |
tree | 2f59736a810a5ca9493a2d2648caaafdf1857874 /net/tipc/bearer.c | |
parent | 03b92017933bd22a3dca6830048877dd3162f872 (diff) |
tipc: move code for resetting links from bearer.c to link.c
We break out the code for resetting attached links in the
function tipc_reset_bearer(), and define a new function named
tipc_link_reset_list() to do this job.
This commit incurs no functional changes, but makes the code
of function tipc_reset_bearer() cleaner. It is also a preparation
for a more important change to the bearer code, in a subsequent
commit in this series.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/bearer.c')
-rw-r--r-- | net/tipc/bearer.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index a38c89969c68..a3bdf5c7f085 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
@@ -350,19 +350,10 @@ exit: | |||
350 | */ | 350 | */ |
351 | static int tipc_reset_bearer(struct tipc_bearer *b_ptr) | 351 | static int tipc_reset_bearer(struct tipc_bearer *b_ptr) |
352 | { | 352 | { |
353 | struct tipc_link *l_ptr; | ||
354 | struct tipc_link *temp_l_ptr; | ||
355 | |||
356 | read_lock_bh(&tipc_net_lock); | 353 | read_lock_bh(&tipc_net_lock); |
357 | pr_info("Resetting bearer <%s>\n", b_ptr->name); | 354 | pr_info("Resetting bearer <%s>\n", b_ptr->name); |
358 | spin_lock_bh(&b_ptr->lock); | 355 | spin_lock_bh(&b_ptr->lock); |
359 | list_for_each_entry_safe(l_ptr, temp_l_ptr, &b_ptr->links, link_list) { | 356 | tipc_link_reset_list(b_ptr); |
360 | struct tipc_node *n_ptr = l_ptr->owner; | ||
361 | |||
362 | spin_lock_bh(&n_ptr->lock); | ||
363 | tipc_link_reset(l_ptr); | ||
364 | spin_unlock_bh(&n_ptr->lock); | ||
365 | } | ||
366 | spin_unlock_bh(&b_ptr->lock); | 357 | spin_unlock_bh(&b_ptr->lock); |
367 | read_unlock_bh(&tipc_net_lock); | 358 | read_unlock_bh(&tipc_net_lock); |
368 | return 0; | 359 | return 0; |