From: George Wilkie <gwilkie@vyatta.att-mail.com>
Date: Thu, 19 Apr 2018 10:34:14 +0000 (+0100)
Subject: team: account for oper state
X-Git-Tag: v4.18-rc1~114^2~425
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f1d22a1e0595639bcfef9941ebc0e3cfe9711009;p=linux.git

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

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