lkml.org 
[lkml]   [2019]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 25/74] be2net: Signal that the device cannot transmit during reconfiguration
    Date
    [ Upstream commit 7429c6c0d9cb086d8e79f0d2a48ae14851d2115e ]

    While changing the number of interrupt channels, be2net stops adapter
    operation (including netif_tx_disable()) but it doesn't signal that it
    cannot transmit. This may lead dev_watchdog() to falsely trigger during
    that time.

    Add the missing call to netif_carrier_off(), following the pattern used in
    many other drivers. netif_carrier_on() is already taken care of in
    be_open().

    Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/emulex/benet/be_main.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
    index bff74752cef16..3fe6a28027fe1 100644
    --- a/drivers/net/ethernet/emulex/benet/be_main.c
    +++ b/drivers/net/ethernet/emulex/benet/be_main.c
    @@ -4700,8 +4700,12 @@ int be_update_queues(struct be_adapter *adapter)
    struct net_device *netdev = adapter->netdev;
    int status;

    - if (netif_running(netdev))
    + if (netif_running(netdev)) {
    + /* device cannot transmit now, avoid dev_watchdog timeouts */
    + netif_carrier_off(netdev);
    +
    be_close(netdev);
    + }

    be_cancel_worker(adapter);

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-08-05 15:26    [W:3.203 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site