diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2011-04-07 15:47:48 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-09-01 11:16:37 -0400 |
commit | 0f38513d22e14f607fc791364856b08cac9f91c9 (patch) | |
tree | def7466b358f3b02ca145883a9604fd7ae08dada /net/tipc | |
parent | 9f6bdcd4286145e812058e4111e906e9830514d8 (diff) |
tipc: Remove obsolete congestion handling when sending a broadcast NACK
Eliminates obsolete code that handles broadcast bearer congestion when
the broadast link sends a NACK message, since the broadcast pseudo-bearer
never becomes blocked.
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/bcast.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index bead28b5efff..28908f54459e 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c | |||
@@ -299,14 +299,9 @@ static void bclink_send_nack(struct tipc_node *n_ptr) | |||
299 | msg_set_bcgap_to(msg, n_ptr->bclink.gap_to); | 299 | msg_set_bcgap_to(msg, n_ptr->bclink.gap_to); |
300 | msg_set_bcast_tag(msg, tipc_own_tag); | 300 | msg_set_bcast_tag(msg, tipc_own_tag); |
301 | 301 | ||
302 | if (tipc_bearer_send(&bcbearer->bearer, buf, NULL)) { | 302 | tipc_bearer_send(&bcbearer->bearer, buf, NULL); |
303 | bcl->stats.sent_nacks++; | 303 | bcl->stats.sent_nacks++; |
304 | buf_discard(buf); | 304 | buf_discard(buf); |
305 | } else { | ||
306 | tipc_bearer_schedule(bcl->b_ptr, bcl); | ||
307 | bcl->proto_msg_queue = buf; | ||
308 | bcl->stats.bearer_congs++; | ||
309 | } | ||
310 | 305 | ||
311 | /* | 306 | /* |
312 | * Ensure we doesn't send another NACK msg to the node | 307 | * Ensure we doesn't send another NACK msg to the node |