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

Commit f2875c3c authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: avoid unnecessary lookup for tipc bearer instance 



tipc_block_bearer() currently takes a bearer name (const char*)
as argument. This requires the function to make a lookup to find
the pointer to the corresponding bearer struct. In the current
code base this is not necessary, since the only two callers
(tipc_continue(),recv_notification()) already have validated
copies of this pointer, and hence can pass it directly in the
function call.

We change tipc_block_bearer() to directly take struct tipc_bearer*
as argument instead.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Reviewed-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4babbaa8

net/tipc/bearer.c

+3 −11
Original line number Diff line number Diff line
@@ -420,23 +420,15 @@ exit: 
}



/**

 * tipc_block_bearer - Block the bearer with the given name, and reset all its links

 * tipc_block_bearer - Block the bearer, and reset all its links

 */

int tipc_block_bearer(const char *name)

int tipc_block_bearer(struct tipc_bearer *b_ptr)

{

	struct tipc_bearer *b_ptr = NULL;

	struct tipc_link *l_ptr;

	struct tipc_link *temp_l_ptr;



	read_lock_bh(&tipc_net_lock);

	b_ptr = tipc_bearer_find(name);

	if (!b_ptr) {

		pr_warn("Attempt to block unknown bearer <%s>\n", name);

		read_unlock_bh(&tipc_net_lock);

		return -EINVAL;

	}



	pr_info("Blocking bearer <%s>\n", name);

	pr_info("Blocking bearer <%s>\n", b_ptr->name);

	spin_lock_bh(&b_ptr->lock);

	b_ptr->blocked = 1;

	list_for_each_entry_safe(l_ptr, temp_l_ptr, &b_ptr->links, link_list) {

net/tipc/bearer.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ int tipc_register_media(struct tipc_media *m_ptr); 


void tipc_recv_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr);



int  tipc_block_bearer(const char *name);

int  tipc_block_bearer(struct tipc_bearer *b_ptr);

void tipc_continue(struct tipc_bearer *tb_ptr);



int tipc_enable_bearer(const char *bearer_name, u32 disc_domain, u32 priority);

net/tipc/eth_media.c

+3 −3
Original line number Diff line number Diff line
@@ -265,17 +265,17 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt, 
		if (netif_carrier_ok(dev))

			tipc_continue(eb_ptr->bearer);

		else

			tipc_block_bearer(eb_ptr->bearer->name);

			tipc_block_bearer(eb_ptr->bearer);

		break;

	case NETDEV_UP:

		tipc_continue(eb_ptr->bearer);

		break;

	case NETDEV_DOWN:

		tipc_block_bearer(eb_ptr->bearer->name);

		tipc_block_bearer(eb_ptr->bearer);

		break;

	case NETDEV_CHANGEMTU:

	case NETDEV_CHANGEADDR:

		tipc_block_bearer(eb_ptr->bearer->name);

		tipc_block_bearer(eb_ptr->bearer);

		tipc_continue(eb_ptr->bearer);

		break;

	case NETDEV_UNREGISTER:

net/tipc/ib_media.c

+3 −3
Original line number Diff line number Diff line
@@ -258,17 +258,17 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt, 
		if (netif_carrier_ok(dev))

			tipc_continue(ib_ptr->bearer);

		else

			tipc_block_bearer(ib_ptr->bearer->name);

			tipc_block_bearer(ib_ptr->bearer);

		break;

	case NETDEV_UP:

		tipc_continue(ib_ptr->bearer);

		break;

	case NETDEV_DOWN:

		tipc_block_bearer(ib_ptr->bearer->name);

		tipc_block_bearer(ib_ptr->bearer);

		break;

	case NETDEV_CHANGEMTU:

	case NETDEV_CHANGEADDR:

		tipc_block_bearer(ib_ptr->bearer->name);

		tipc_block_bearer(ib_ptr->bearer);

		tipc_continue(ib_ptr->bearer);

		break;

	case NETDEV_UNREGISTER: