Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23f0ff90 authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker
Browse files

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: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 2ff9f924

net/tipc/bcast.c

+0 −21
Original line number Diff line number Diff line
@@ -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)

{

net/tipc/bcast.h

+0 −1
Original line number Diff line number Diff line
@@ -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

net/tipc/bearer.c

+1 −5
Original line number Diff line number Diff line
@@ -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();

}