From: Allan Stephens Date: Thu, 7 Apr 2011 19:47:48 +0000 (-0400) Subject: tipc: Remove obsolete congestion handling when sending a broadcast NACK X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0f38513d22e14f607fc791364856b08cac9f91c9;p=mv-sheeva.git 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 Signed-off-by: Paul Gortmaker --- diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index bead28b5eff..28908f54459 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) msg_set_bcgap_to(msg, n_ptr->bclink.gap_to); msg_set_bcast_tag(msg, tipc_own_tag); - if (tipc_bearer_send(&bcbearer->bearer, buf, NULL)) { - bcl->stats.sent_nacks++; - buf_discard(buf); - } else { - tipc_bearer_schedule(bcl->b_ptr, bcl); - bcl->proto_msg_queue = buf; - bcl->stats.bearer_congs++; - } + tipc_bearer_send(&bcbearer->bearer, buf, NULL); + bcl->stats.sent_nacks++; + buf_discard(buf); /* * Ensure we doesn't send another NACK msg to the node