diff options
author | Allan Stephens <Allan.Stephens@windriver.com> | 2011-04-21 20:05:25 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-05-10 16:04:01 -0400 |
commit | 1209966cd5d2ec7f89ad2ed58a6a342aa8ea8712 (patch) | |
tree | 9de9cbaf37a33ae5be16f3d57eb10f9b3aaef216 /net/tipc/bearer.c | |
parent | 691a62075922b43b2b03def87ebcfdfbf0cd2ed8 (diff) |
tipc: Add monitoring of number of nodes discovered by bearer
Augments TIPC's discovery object to track the number of neighboring nodes
having an active link to the associated bearer.
This means tipc_disc_update_link_req() becomes either one of:
tipc_disc_add_dest()
or:
tipc_disc_remove_dest()
depending on the code flow direction of things.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/bearer.c')
-rw-r--r-- | net/tipc/bearer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 5fcd1c1214fd..85209eadfae6 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
@@ -344,15 +344,15 @@ struct sk_buff *tipc_bearer_get_names(void) | |||
344 | void tipc_bearer_add_dest(struct tipc_bearer *b_ptr, u32 dest) | 344 | void tipc_bearer_add_dest(struct tipc_bearer *b_ptr, u32 dest) |
345 | { | 345 | { |
346 | tipc_nmap_add(&b_ptr->nodes, dest); | 346 | tipc_nmap_add(&b_ptr->nodes, dest); |
347 | tipc_disc_update_link_req(b_ptr->link_req); | ||
348 | tipc_bcbearer_sort(); | 347 | tipc_bcbearer_sort(); |
348 | tipc_disc_add_dest(b_ptr->link_req); | ||
349 | } | 349 | } |
350 | 350 | ||
351 | void tipc_bearer_remove_dest(struct tipc_bearer *b_ptr, u32 dest) | 351 | void tipc_bearer_remove_dest(struct tipc_bearer *b_ptr, u32 dest) |
352 | { | 352 | { |
353 | tipc_nmap_remove(&b_ptr->nodes, dest); | 353 | tipc_nmap_remove(&b_ptr->nodes, dest); |
354 | tipc_disc_update_link_req(b_ptr->link_req); | ||
355 | tipc_bcbearer_sort(); | 354 | tipc_bcbearer_sort(); |
355 | tipc_disc_remove_dest(b_ptr->link_req); | ||
356 | } | 356 | } |
357 | 357 | ||
358 | /* | 358 | /* |