Skip to content

Commit

Permalink
team: update master carrier state
Browse files Browse the repository at this point in the history
Update master's carrier state when there is any
change with its ports.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Flavio Leitner authored and David S. Miller committed Jan 3, 2013
1 parent f8ca2b6 commit 06a7fc4
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions drivers/net/team/team.c
Original file line number Diff line number Diff line change
Expand Up @@ -1400,13 +1400,11 @@ static void team_destructor(struct net_device *dev)

static int team_open(struct net_device *dev)
{
netif_carrier_on(dev);
return 0;
}

static int team_close(struct net_device *dev)
{
netif_carrier_off(dev);
return 0;
}

Expand Down Expand Up @@ -2560,21 +2558,43 @@ static void __team_port_change_send(struct team_port *port, bool linkup)

}

static void __team_carrier_check(struct team *team)
{
struct team_port *port;
bool team_linkup;

team_linkup = false;
list_for_each_entry(port, &team->port_list, list) {
if (port->linkup) {
team_linkup = true;
break;
}
}

if (team_linkup)
netif_carrier_on(team->dev);
else
netif_carrier_off(team->dev);
}

static void __team_port_change_check(struct team_port *port, bool linkup)
{
if (port->state.linkup != linkup)
__team_port_change_send(port, linkup);
__team_carrier_check(port->team);
}

static void __team_port_change_port_added(struct team_port *port, bool linkup)
{
__team_port_change_send(port, linkup);
__team_carrier_check(port->team);
}

static void __team_port_change_port_removed(struct team_port *port)
{
port->removed = true;
__team_port_change_send(port, false);
__team_carrier_check(port->team);
}

static void team_port_change_check(struct team_port *port, bool linkup)
Expand Down

0 comments on commit 06a7fc4

Please sign in to comment.