[Intel-wired-lan] [net-next S4 07/15] i40evf: restore state
Catherine Sullivan
catherine.sullivan at intel.com
Fri Apr 17 00:06:04 UTC 2015
From: Mitch Williams <mitch.a.williams at intel.com>
If the netdev is closed when a reset occurs, the adapter state will be
left in the RESETTING state incorrectly. Correct this deficiency.
Signed-off-by: Mitch Williams <mitch.a.williams at intel.com>
Change-ID: Ia0c5bf0449f7c81609f6f646e6b805f030d3360d
---
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 7c53aca..37e66ec 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1624,7 +1624,8 @@ continue_reset:
goto reset_err;
i40evf_irq_enable(adapter, true);
- }
+ } else
+ adapter->state = __I40EVF_DOWN;
return;
reset_err:
dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit\n");
--
1.9.3
More information about the Intel-wired-lan
mailing list