kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2012-07-11 05:34:02 +00:00 committed by David S. Miller
parent f0a70e902f
commit 6e88e1357c
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/team/team.c
View file

@ -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

6
drivers/net/team/team_mode_roundrobin.c
View file

@ -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;

1
include/linux/if_team.h
View file

@ -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);