diff options
| author | Allan Stephens <allan.stephens@windriver.com> | 2011-05-26 13:59:17 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-09-01 11:16:37 -0400 |
| commit | 4b3743ef2ca67e1f8ef7e9d4c551d6ba6ee85584 (patch) | |
| tree | 5073fcd176c616f25808d688d47a7050c16cb647 /net/tipc | |
| parent | a0f40f02ef0783688233caf737a17f1f56283e2b (diff) | |
| download | linux-stable-4b3743ef2ca67e1f8ef7e9d4c551d6ba6ee85584.tar.gz linux-stable-4b3743ef2ca67e1f8ef7e9d4c551d6ba6ee85584.tar.bz2 linux-stable-4b3743ef2ca67e1f8ef7e9d4c551d6ba6ee85584.zip | |
tipc: Ensure congested links receive bearer status updates
Modifies code that disables a bearer to ensure that all of its links
are deleted, not just its uncongested links. Similarly, modifies code
that blocks a bearer to ensure that all of its links are reset, not
just its uncongested links.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/bearer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index e465a92a4f9c..e2202de3d93e 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -604,6 +604,7 @@ int tipc_block_bearer(const char *name) info("Blocking bearer <%s>\n", name); spin_lock_bh(&b_ptr->lock); b_ptr->blocked = 1; + list_splice_init(&b_ptr->cong_links, &b_ptr->links); list_for_each_entry_safe(l_ptr, temp_l_ptr, &b_ptr->links, link_list) { struct tipc_node *n_ptr = l_ptr->owner; @@ -631,6 +632,7 @@ static void bearer_disable(struct tipc_bearer *b_ptr) spin_lock_bh(&b_ptr->lock); b_ptr->blocked = 1; b_ptr->media->disable_bearer(b_ptr); + list_splice_init(&b_ptr->cong_links, &b_ptr->links); list_for_each_entry_safe(l_ptr, temp_l_ptr, &b_ptr->links, link_list) { tipc_link_delete(l_ptr); } |