From 92f0cb832c9f7f2a6a24b3fc691429942d0dad5e Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Thu, 7 Apr 2011 11:25:26 -0400
Subject: [PATCH] --- yaml --- r: 266103 b: refs/heads/master c:
 23f0ff906af93be6edb579824474117b232c7cc0 h: refs/heads/master i:   266101:
 b5ad383534a995ea8c162f6d755860f6925d9a3a   266099:
 1092b002f4e2b8c773482e09692be624871c2d64   266095:
 1f1f61707a0c02ebb6ddddd2ec25998bf1e8aae0 v: v3

---
 [refs]                  |  2 +-
 trunk/net/tipc/bcast.c  | 21 ---------------------
 trunk/net/tipc/bcast.h  |  1 -
 trunk/net/tipc/bearer.c |  6 +-----
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index a1147e1e2e8b..18186bc767ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ff9f924a565aa22c06169c89fcd2133d820a9d2
+refs/heads/master: 23f0ff906af93be6edb579824474117b232c7cc0
diff --git a/trunk/net/tipc/bcast.c b/trunk/net/tipc/bcast.c
index 7abdca0de281..5200457eaeb4 100644
--- a/trunk/net/tipc/bcast.c
+++ b/trunk/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/trunk/net/tipc/bcast.h b/trunk/net/tipc/bcast.h
index 500c97f1c859..06740da5ae61 100644
--- a/trunk/net/tipc/bcast.h
+++ b/trunk/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/trunk/net/tipc/bearer.c b/trunk/net/tipc/bearer.c
index 85eba9c08ee9..e465a92a4f9c 100644
--- a/trunk/net/tipc/bearer.c
+++ b/trunk/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();
 }