From a663d39dea4c19d4d815e8edf3a351385d3edf56 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 25 Nov 2009 16:08:52 +0000
Subject: [PATCH] --- yaml --- r: 171949 b: refs/heads/master c:
 332c1ce9e7b0f9285cba0cf3d32bad87a4f8e40a h: refs/heads/master i:   171947:
 f9600a228915adbea96a5e11b06f9bf9736b3abc v: v3

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

diff --git a/[refs] b/[refs]
index 7a5790f923c8..8c6dd111c254 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80cb9a0f7f381e1c0e9f6dabec6e67db0dd3a0d9
+refs/heads/master: 332c1ce9e7b0f9285cba0cf3d32bad87a4f8e40a
diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
index 4787faaf30c1..9f3ef387a047 100644
--- a/trunk/drivers/net/sfc/efx.c
+++ b/trunk/drivers/net/sfc/efx.c
@@ -186,7 +186,8 @@ static void efx_fini_channels(struct efx_nic *efx);
 
 #define EFX_ASSERT_RESET_SERIALISED(efx)		\
 	do {						\
-		if (efx->state == STATE_RUNNING)	\
+		if ((efx->state == STATE_RUNNING) ||	\
+		    (efx->state == STATE_DISABLED))	\
 			ASSERT_RTNL();			\
 	} while (0)