leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Ben Hutchings <bhutchings@solarflare.com>
This commit is contained in:
Ben Hutchings 2012-07-27 20:48:36 +01:00
parent 8b7325b4e2
commit b812f8b7a9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/sfc/efx.c
View File

@ -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 /* If we're not READY then don't reset. Leave the reset_pending
* flags set so that efx_pci_probe_main will be retried */ * flags set so that efx_pci_probe_main will be retried */
if (efx->state != STATE_READY) { if (efx->state != STATE_READY)
netif_info(efx, drv, efx->net_dev,
"scheduled reset quenched; NIC not ready\n");
return; return;
}
rtnl_lock(); rtnl_lock();
(void)efx_reset(efx, fls(pending) - 1); (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. * probably hosed anyway.
*/ */
if (efx->reset_pending) { if (efx->reset_pending) {
netif_err(efx, probe, efx->net_dev,
"aborting probe due to scheduled reset\n");
rc = -EIO; rc = -EIO;
goto fail4; goto fail4;
} }