Commit f49a4589 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Always close net device at the end of a disabling reset 



This fixes a regression introduced by commit
eb9f6744 "sfc: Implement ethtool
reset operation".

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Cc: stable@kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aabc5649

drivers/net/sfc/efx.c

+2 −2
Original line number Diff line number Diff line
@@ -1861,6 +1861,7 @@ int efx_reset(struct efx_nic *efx, enum reset_type method) 
	}



	if (disabled) {

		dev_close(efx->net_dev);

		EFX_ERR(efx, "has been disabled\n");

		efx->state = STATE_DISABLED;

	} else {
@@ -1884,8 +1885,7 @@ static void efx_reset_work(struct work_struct *data) 
	}



	rtnl_lock();

	if (efx_reset(efx, efx->reset_pending))

		dev_close(efx->net_dev);

	(void)efx_reset(efx, efx->reset_pending);

	rtnl_unlock();

}