diff options
| author |   Benjamin Poirier <bpoirier@suse.com> | 2019-07-16 17:16:55 +0900 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-16 12:41:37 -0700 |
| commit | 7429c6c0d9cb086d8e79f0d2a48ae14851d2115e (patch) | |
| tree | c13cff6aceb097f9eaf8e029f17fd66cc000c397 /drivers/net/ethernet/emulex/benet/be_main.c | |
| parent | net: ethernet: mediatek: mtk_eth_soc: Add of_node_put() before goto (diff) | |
| download | linux-dev-7429c6c0d9cb086d8e79f0d2a48ae14851d2115e.tar.xz linux-dev-7429c6c0d9cb086d8e79f0d2a48ae14851d2115e.zip | |
be2net: Signal that the device cannot transmit during reconfiguration
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>
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be_main.c')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 82015c8a5ed7..b7a246b33599 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -4697,8 +4697,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); |