lkml.org 
[lkml]   [2019]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 32/52] team: use operstate consistently for linkup
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: George Wilkie <gwilkie@vyatta.att-mail.com>

    [ 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: f1d22a1e0595 ("team: account for oper state")
    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/team/team.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/team/team.c
    +++ b/drivers/net/team/team.c
    @@ -1256,7 +1256,7 @@ static int team_port_add(struct team *te
    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 noti

    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:

    \
     
     \ /
      Last update: 2019-03-18 10:45    [W:4.139 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site