tipc: remove the bearer congestion mechanism

Currently at the TIPC bearer layer there is the following congestion
mechanism:

Once sending packets has failed via that bearer, the bearer will be
flagged as being in congested state at once. During bearer congestion,
all packets arriving at link will be queued on the link's outgoing
buffer.  When we detect that the state of bearer congestion has
relaxed (e.g. some packets are received from the bearer) we will try
our best to push all packets in the link's outgoing buffer until the
buffer is empty, or until the bearer is congested again.

However, in fact the TIPC bearer never receives any feedback from the
device layer whether a send was successful or not, so it must always
assume it was successful. Therefore, the bearer congestion mechanism
as it exists currently is of no value.

But the bearer blocking state is still useful for us. For example,
when the physical media goes down/up, we need to change the state of
the links bound to the bearer.  So the code maintaing the state
information is not removed.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

1 files changed, 9 insertions, 12 deletions

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index e4e6d8cd47e..40da098eeb3 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -619,16 +619,14 @@ static int tipc_bcbearer_send(struct sk_buff *buf,
                 if (bcbearer->remains_new.count == bcbearer->remains.count)
                         continue;       /* bearer pair doesn't add anything */
 
-                if (p->blocked ||
-                    p->media->send_msg(buf, p, &p->media->bcast_addr)) {
+                if (!tipc_bearer_blocked(p))
+                        tipc_bearer_send(p, buf, &p->media->bcast_addr);
+                else if (s && !tipc_bearer_blocked(s))
                         /* unable to send on primary bearer */
-                        if (!s || s->blocked ||
-                            s->media->send_msg(buf, s,
-                                               &s->media->bcast_addr)) {
-                                /* unable to send on either bearer */
-                                continue;
-                        }
-                }
+                        tipc_bearer_send(s, buf, &s->media->bcast_addr);
+                else
+                        /* unable to send on either bearer */
+                        continue;
 
                 if (s) {
                         bcbearer->bpairs[bp_index].primary = s;
@@ -731,8 +729,8 @@ int tipc_bclink_stats(char *buf, const u32 buf_size)
                              "  TX naks:%u acks:%u dups:%u\n",
                              s->sent_nacks, s->sent_acks, s->retransmitted);
         ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  Congestion bearer:%u link:%u  Send queue max:%u avg:%u\n",
-                             s->bearer_congs, s->link_congs, s->max_queue_sz,
+                             "  Congestion link:%u  Send queue max:%u avg:%u\n",
+                             s->link_congs, s->max_queue_sz,
                              s->queue_sz_counts ?
                              (s->accu_queue_sz / s->queue_sz_counts) : 0);
 
@@ -766,7 +764,6 @@ int tipc_bclink_set_queue_limits(u32 limit)
 
 void tipc_bclink_init(void)
 {
-        INIT_LIST_HEAD(&bcbearer->bearer.cong_links);
         bcbearer->bearer.media = &bcbearer->media;
         bcbearer->media.send_msg = tipc_bcbearer_send;
         sprintf(bcbearer->media.name, "tipc-broadcast");