Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5c31b5a authored by George Wilkie's avatar George Wilkie Committed by Greg Kroah-Hartman
Browse files

team: use operstate consistently for linkup 



[ Upstream commit 8c7a77267eec81dd81af8412f29e50c0b1082548 ]

When a port is added to a team, its initial state is derived
from netif_carrier_ok rather than netif_oper_up.
If it is carrier up but operationally down at the time of being
added, the port state.linkup will be set prematurely.
port state.linkup should be set consistently using
netif_oper_up rather than netif_carrier_ok.

Fixes: f1d22a1e ("team: account for oper state")
Signed-off-by: default avatarGeorge Wilkie <gwilkie@vyatta.att-mail.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b9d0cb75

drivers/net/team/team.c

+2 −2
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev, 
	list_add_tail_rcu(&port->list, &team->port_list);

	team_port_enable(team, port);

	__team_compute_features(team);

	__team_port_change_port_added(port, !!netif_carrier_ok(port_dev));

	__team_port_change_port_added(port, !!netif_oper_up(port_dev));

	__team_options_change_check(team);



	netdev_info(dev, "Port device %s added\n", portname);
@@ -2918,7 +2918,7 @@ static int team_device_event(struct notifier_block *unused, 


	switch (event) {

	case NETDEV_UP:

		if (netif_carrier_ok(dev))

		if (netif_oper_up(dev))

			team_port_change_check(port, true);

		break;

	case NETDEV_DOWN: