diff options
| author | Flavio Leitner <fbl@redhat.com> | 2013-02-05 10:30:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-06 21:48:09 +0100 |
| commit | e185483e6b84c127d0b1c890b6b703701ae52d35 (patch) | |
| tree | 199255216263143c2ee1fd24030611c531621988 /drivers/net/team | |
| parent | drivers: net:ethernet: cpsw: add support for VLAN (diff) | |
| download | linux-e185483e6b84c127d0b1c890b6b703701ae52d35.tar.xz linux-e185483e6b84c127d0b1c890b6b703701ae52d35.zip | |
team: allow userspace to take control over carrier
Some modes don't require any special carrier handling so
in these cases, the kernel can control the carrier as for
any other interface. However, some other modes, e.g. lacp,
requires more than just that, so userspace needs to control
the carrier itself.
The daemon today is ready to control it, but the kernel
still can change it based on events.
This fix so that either kernel or userspace is controlling
the carrier.
Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
| -rw-r--r-- | drivers/net/team/team.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 694ccf6d71a3..05c5efe84591 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -508,6 +508,7 @@ static bool team_is_mode_set(struct team *team) static void team_set_no_mode(struct team *team) { + team->user_carrier_enabled = false; team->mode = &__team_no_mode; } @@ -1710,6 +1711,10 @@ static netdev_features_t team_fix_features(struct net_device *dev, static int team_change_carrier(struct net_device *dev, bool new_carrier) { + struct team *team = netdev_priv(dev); + + team->user_carrier_enabled = true; + if (new_carrier) netif_carrier_on(dev); else @@ -2573,6 +2578,9 @@ static void __team_carrier_check(struct team *team) struct team_port *port; bool team_linkup; + if (team->user_carrier_enabled) + return; + team_linkup = false; list_for_each_entry(port, &team->port_list, list) { if (port->linkup) { |