From: Steve Hodgson <shodgson@solarflare.com>
Date: Mon, 9 Jun 2008 18:34:32 +0000 (+0100)
Subject: sfc: Recover from RX queue flush failure
X-Git-Tag: v2.6.26-rc6~13^2^2~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=23bdfdd388723b8213f597743b1d4aba0d62de9c;p=linux-2.6-omap-h63xx.git

sfc: Recover from RX queue flush failure

RX queue flush can fail if traffic continues to arrive.  Recover by
performing an invisible reset.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index d3f749c72d4..790db89db34 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -733,8 +733,10 @@ void falcon_fini_rx(struct efx_rx_queue *rx_queue)
 			continue;
 		break;
 	}
-	if (rc)
+	if (rc) {
 		EFX_ERR(efx, "failed to flush rx queue %d\n", rx_queue->queue);
+		efx_schedule_reset(efx, RESET_TYPE_INVISIBLE);
+	}
 
 	/* Remove RX descriptor ring from card */
 	EFX_ZERO_OWORD(rx_desc_ptr);