From 667fd632d602fb1b4132dfb35b5756f92327c144 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 1 Sep 2008 12:50:08 +0100
Subject: [PATCH] --- yaml --- r: 111830 b: refs/heads/master c:
 1d0680fd6235e0aa5baf14a8f1ff85eff9dc1fb3 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/sfc/falcon.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1d1108655feb..77616b7c7f5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a620e134e989b7ce683574039fc7cb956aa58970
+refs/heads/master: 1d0680fd6235e0aa5baf14a8f1ff85eff9dc1fb3
diff --git a/trunk/drivers/net/sfc/falcon.c b/trunk/drivers/net/sfc/falcon.c
index 70c681ecdabe..3a5289fe8d1d 100644
--- a/trunk/drivers/net/sfc/falcon.c
+++ b/trunk/drivers/net/sfc/falcon.c
@@ -1953,8 +1953,10 @@ int falcon_dma_stats(struct efx_nic *efx, unsigned int done_offset)
 
 	/* Wait for transfer to complete */
 	for (i = 0; i < 400; i++) {
-		if (*(volatile u32 *)dma_done == FALCON_STATS_DONE)
+		if (*(volatile u32 *)dma_done == FALCON_STATS_DONE) {
+			rmb(); /* Ensure the stats are valid. */
 			return 0;
+		}
 		udelay(10);
 	}