Skip to content

Commit 855a631

Browse files
Lijun Pankuba-moo
authored andcommitted
ibmvnic: skip tx timeout reset while in resetting
Sometimes it takes longer than 5 seconds (watchdog timeout) to complete failover, migration, and other resets. In stead of scheduling another timeout reset, we wait for the current one to complete. Suggested-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: Lijun Pan <ljp@linux.ibm.com> Reviewed-by: Dany Madden <drt@linux.ibm.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 98025bc commit 855a631

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2356,6 +2356,12 @@ static void ibmvnic_tx_timeout(struct net_device *dev, unsigned int txqueue)
23562356
{
23572357
struct ibmvnic_adapter *adapter = netdev_priv(dev);
23582358

2359+
if (test_bit(0, &adapter->resetting)) {
2360+
netdev_err(adapter->netdev,
2361+
"Adapter is resetting, skip timeout reset\n");
2362+
return;
2363+
}
2364+
23592365
ibmvnic_reset(adapter, VNIC_RESET_TIMEOUT);
23602366
}
23612367

0 commit comments

Comments
 (0)