tipc: Remove code to emulate loss of broadcast messages

Eliminates optional code used to test TIPC's ability to recover
from lost broadcast messages. This code duplicates functionality
already provided by the network stack's QoS option "network emulator".

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 7dc1dc7151ea876a4baef3afa547ad1f098523c6..08e3216a33d29d67532db20031499fbcb633e937 100644 (file)
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -44,13 +44,6 @@
 
 #define BCLINK_WIN_DEFAULT 20          /* bcast link window size (default) */
 
-/*
- * Loss rate for incoming broadcast frames; used to test retransmission code.
- * Set to N to cause every N'th frame to be discarded; 0 => don't discard any.
- */
-
-#define TIPC_BCAST_LOSS_RATE 0
-
 /**
  * struct bcbearer_pair - a pair of bearers used by broadcast link
  * @primary: pointer to primary bearer
@@ -434,9 +427,6 @@ int tipc_bclink_send_msg(struct sk_buff *buf)
 
 void tipc_bclink_recv_pkt(struct sk_buff *buf)
 {
-#if (TIPC_BCAST_LOSS_RATE)
-       static int rx_count;
-#endif
        struct tipc_msg *msg = buf_msg(buf);
        struct tipc_node *node = tipc_node_find(msg_prevnode(msg));
        u32 next_in;
@@ -470,14 +460,6 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf)
                return;
        }
 
-#if (TIPC_BCAST_LOSS_RATE)
-       if (++rx_count == TIPC_BCAST_LOSS_RATE) {
-               rx_count = 0;
-               buf_discard(buf);
-               return;
-       }
-#endif
-
        tipc_node_lock(node);
 receive:
        deferred = node->bclink.deferred_head;