Commit b812f8b7 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Improve log messages in case we abort probe due to a pending reset 



The current informational message doesn't properly explain what
happens, and could also appear if we defer a reset during
suspend/resume.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent 8b7325b4

drivers/net/ethernet/sfc/efx.c

+3 −4
Original line number Diff line number Diff line
@@ -2311,11 +2311,8 @@ static void efx_reset_work(struct work_struct *data) 


	/* If we're not READY then don't reset. Leave the reset_pending

	 * flags set so that efx_pci_probe_main will be retried */

	if (efx->state != STATE_READY) {

		netif_info(efx, drv, efx->net_dev,

			   "scheduled reset quenched; NIC not ready\n");

	if (efx->state != STATE_READY)

		return;

	}



	rtnl_lock();

	(void)efx_reset(efx, fls(pending) - 1);
@@ -2703,6 +2700,8 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev, 
	 * probably hosed anyway.

	 */

	if (efx->reset_pending) {

		netif_err(efx, probe, efx->net_dev,

			  "aborting probe due to scheduled reset\n");

		rc = -EIO;

		goto fail4;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE