Commit 855a631a authored by Lijun Pan's avatar Lijun Pan Committed by Jakub Kicinski
Browse files

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: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarLijun Pan <ljp@linux.ibm.com>
Reviewed-by: default avatarDany Madden <drt@linux.ibm.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 98025bce

drivers/net/ethernet/ibm/ibmvnic.c

+6 −0
Original line number Diff line number Diff line
@@ -2356,6 +2356,12 @@ static void ibmvnic_tx_timeout(struct net_device *dev, unsigned int txqueue) 
{

	struct ibmvnic_adapter *adapter = netdev_priv(dev);



	if (test_bit(0, &adapter->resetting)) {

		netdev_err(adapter->netdev,

			   "Adapter is resetting, skip timeout reset\n");

		return;

	}



	ibmvnic_reset(adapter, VNIC_RESET_TIMEOUT);

}