From 00c96457cb7c0d21adcb0ab1f05fba7fc252472d Mon Sep 17 00:00:00 2001 From: Steve Hodgson Date: Tue, 1 Jun 2010 11:17:24 +0000 Subject: [PATCH] --- yaml --- r: 202613 b: refs/heads/master c: 319ba649af30321ea221740833785b46e1fe6af3 h: refs/heads/master i: 202611: d4832ddc74610e7b16007b0d5ba83b7c4cc82032 v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/efx.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e5bcc7602880..c5ef15651f33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bd9303500b1961d15aae783f17075936026ae79 +refs/heads/master: 319ba649af30321ea221740833785b46e1fe6af3 diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c index 156460527231..0319000379e1 100644 --- a/trunk/drivers/net/sfc/efx.c +++ b/trunk/drivers/net/sfc/efx.c @@ -1886,6 +1886,9 @@ static void efx_reset_work(struct work_struct *data) { struct efx_nic *efx = container_of(data, struct efx_nic, reset_work); + if (efx->reset_pending == RESET_TYPE_NONE) + return; + /* If we're not RUNNING then don't reset. Leave the reset_pending * flag set so that efx_pci_probe_main will be retried */ if (efx->state != STATE_RUNNING) { @@ -2332,6 +2335,9 @@ static int efx_pm_thaw(struct device *dev) efx->type->resume_wol(efx); + /* Reschedule any quenched resets scheduled during efx_pm_freeze() */ + queue_work(reset_workqueue, &efx->reset_work); + return 0; }