tipc: Remove obsolete congestion handling when sending a broadcast NACK
authorAllan Stephens <allan.stephens@windriver.com>
Thu, 7 Apr 2011 19:47:48 +0000 (15:47 -0400)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 1 Sep 2011 15:16:37 +0000 (11:16 -0400)
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>
net/tipc/bcast.c

index bead28b5efffd23fe74b779c183b89de575e65aa..28908f54459e2d4e0a95f5760eeaa179971658cc 100644 (file)
@@ -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