team: use operstate consistently for linkup [Linux 5.0]

This Linux kernel change "team: use operstate consistently for linkup" is included in the Linux 5.0 release. This change is authored by George Wilkie <gwilkie [at] vyatta.att-mail.com> on Wed Feb 20 08:19:11 2019 +0000. The commit for this change in Linux stable tree is 8c7a772 (patch).

team: use operstate consistently for linkup

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: f1d22a1e0595 ("team: account for oper state")
Signed-off-by: George Wilkie <[email protected]>
Acked-by: Jiri Pirko <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

There are 4 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/team/team.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 958f1cf..6ce3f66 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1256,7 +1256,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);
@@ -2915,7 +2915,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:

Leave a Reply

Your email address will not be published. Required fields are marked *