Skip to content

Commit

Permalink
tipc: Remove non-executable code to handle broadcast bearer congestion
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Allan Stephens authored and Paul Gortmaker committed Sep 1, 2011
1 parent 2ff9f92 commit 23f0ff9
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 27 deletions.
21 changes: 0 additions & 21 deletions net/tipc/bcast.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
1 change: 0 additions & 1 deletion net/tipc/bcast.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 1 addition & 5 deletions net/tipc/bearer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}


Expand Down

0 comments on commit 23f0ff9

Please sign in to comment.