| From 6b680adaf123db3dbbd4eaa9222821d5933895e0 Mon Sep 17 00:00:00 2001 |
| From: Benjamin Poirier <bpoirier@suse.com> |
| Date: Tue, 16 Jul 2019 17:16:55 +0900 |
| Subject: be2net: Signal that the device cannot transmit during reconfiguration |
| |
| [ 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 b2eeecb26939b..289560b0f6433 100644 |
| --- a/drivers/net/ethernet/emulex/benet/be_main.c |
| +++ b/drivers/net/ethernet/emulex/benet/be_main.c |
| @@ -4701,8 +4701,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 |
| |
