summaryrefslogtreecommitdiff
path: root/drivers/net/team
diff options
context:
space:
mode:
authorGeorge Wilkie <gwilkie@vyatta.att-mail.com>2018-04-19 13:34:14 +0300
committerDavid S. Miller <davem@davemloft.net>2018-04-20 18:05:19 +0300
commitf1d22a1e0595639bcfef9941ebc0e3cfe9711009 (patch)
tree4cf9196b4bb5a11a62b2bc5d019926fde7126b1a /drivers/net/team
parentddf967bb6bf26b869339101005880dcfd2363ada (diff)
downloadlinux-f1d22a1e0595639bcfef9941ebc0e3cfe9711009.tar.xz
team: account for oper state
Account for operational state when determining port linkup state, as per Documentation/networking/operstates.txt. Signed-off-by: George Wilkie <gwilkie@vyatta.att-mail.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
-rw-r--r--drivers/net/team/team.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index a6c6ce19eeee..8a8611095ca0 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2918,7 +2918,7 @@ static int team_device_event(struct notifier_block *unused,
case NETDEV_CHANGE:
if (netif_running(port->dev))
team_port_change_check(port,
- !!netif_carrier_ok(port->dev));
+ !!netif_oper_up(port->dev));
break;
case NETDEV_UNREGISTER:
team_del_slave(port->team->dev, dev);