lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 072/496] ibmvnic: Wait until reset is complete to set carrier on
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>

    [ Upstream commit cc85c02edfe48a34865ae00f7d22298a3fdd17aa ]

    Pushes back setting the carrier on until the end of the reset
    code. This resolves a bug where a watchdog timer was detecting
    that a TX queue had stalled before the adapter reset was complete.

    Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/ibm/ibmvnic.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/ibm/ibmvnic.c
    +++ b/drivers/net/ethernet/ibm/ibmvnic.c
    @@ -1460,8 +1460,6 @@ static int do_reset(struct ibmvnic_adapt
    return 0;
    }

    - netif_carrier_on(netdev);
    -
    /* kick napi */
    for (i = 0; i < adapter->req_rx_queues; i++)
    napi_schedule(&adapter->napi[i]);
    @@ -1469,6 +1467,8 @@ static int do_reset(struct ibmvnic_adapt
    if (adapter->reset_reason != VNIC_RESET_FAILOVER)
    netdev_notify_peers(netdev);

    + netif_carrier_on(netdev);
    +
    return 0;
    }


    \
     
     \ /
      Last update: 2018-05-28 12:46    [W:4.040 / U:0.468 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site