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

Commit 6e88e135 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

team: use function team_port_txable() for determing enabled and up port 



Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0a70e90

drivers/net/team/team.c

+6 −0
Original line number Diff line number Diff line
@@ -677,6 +677,12 @@ bool team_port_enabled(struct team_port *port) 
}

EXPORT_SYMBOL(team_port_enabled);



bool team_port_txable(struct team_port *port)

{

	return port->linkup && team_port_enabled(port);

}

EXPORT_SYMBOL(team_port_txable);



/*

 * Enable/disable port by adding to enabled port hashlist and setting

 * port->index (Might be racy so reader could see incorrect ifindex when

drivers/net/team/team_mode_roundrobin.c

+3 −3
Original line number Diff line number Diff line
@@ -30,16 +30,16 @@ static struct team_port *__get_first_port_up(struct team *team, 
{

	struct team_port *cur;



	if (port->linkup)

	if (team_port_txable(port))

		return port;

	cur = port;

	list_for_each_entry_continue_rcu(cur, &team->port_list, list)

		if (cur->linkup)

		if (team_port_txable(port))

			return cur;

	list_for_each_entry_rcu(cur, &team->port_list, list) {

		if (cur == port)

			break;

		if (cur->linkup)

		if (team_port_txable(port))

			return cur;

	}

	return NULL;

include/linux/if_team.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct team_port { 
};



extern bool team_port_enabled(struct team_port *port);

extern bool team_port_txable(struct team_port *port);



struct team_mode_ops {

	int (*init)(struct team *team);