tipc: Remove non-executable code to handle broadcast bearer congestion

Eliminates code associated with the sending of unsent broadcast link
traffic when the broadcast pseudo-bearer becomes unblocked following a
temporary congestion situation. This code is non-executable because the
broadcast pseudo-bearer never becomes blocked [see tipc_bcbearer_send()].

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 7abdca0de281661fddf037950cb28d737486045b..5200457eaeb4d285ae4c8d35e71e4185f337c756 100644 (file)
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -667,27 +667,6 @@ void tipc_bcbearer_sort(void)
        spin_unlock_bh(&bc_lock);
 }
 
-/**
- * tipc_bcbearer_push - resolve bearer congestion
- *
- * Forces bclink to push out any unsent packets, until all packets are gone
- * or congestion reoccurs.
- * No locks set when function called
- */
-
-void tipc_bcbearer_push(void)
-{
-       struct tipc_bearer *b_ptr;
-
-       spin_lock_bh(&bc_lock);
-       b_ptr = &bcbearer->bearer;
-       if (b_ptr->blocked) {
-               b_ptr->blocked = 0;
-               tipc_bearer_lock_push(b_ptr);
-       }
-       spin_unlock_bh(&bc_lock);
-}
-
 
 int tipc_bclink_stats(char *buf, const u32 buf_size)
 {

diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h
index 500c97f1c8596b07386689e7448c4fb9bdc23a7a..06740da5ae614b30e10f3c3d938cc2ced8283b34 100644 (file)
--- a/net/tipc/bcast.h
+++ b/net/tipc/bcast.h
@@ -101,6 +101,5 @@ int  tipc_bclink_stats(char *stats_buf, const u32 buf_size);
 int  tipc_bclink_reset_stats(void);
 int  tipc_bclink_set_queue_limits(u32 limit);
 void tipc_bcbearer_sort(void);
-void tipc_bcbearer_push(void);
 
 #endif

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 85eba9c08ee9667e978d548c0aaea4d7506b2e5f..e465a92a4f9ce2e8252f6ec274b7621a37d81f43 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -385,13 +385,9 @@ static int bearer_push(struct tipc_bearer *b_ptr)
 
 void tipc_bearer_lock_push(struct tipc_bearer *b_ptr)
 {
-       int res;
-
        spin_lock_bh(&b_ptr->lock);
-       res = bearer_push(b_ptr);
+       bearer_push(b_ptr);
        spin_unlock_bh(&b_ptr->lock);
-       if (res)
-               tipc_bcbearer_push();
 }