From c638e74166a08c5ee6a02bd13755e10fb051247d Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 1 Sep 2008 12:49:08 +0100
Subject: [PATCH] --- yaml --- r: 111359 b: refs/heads/master c:
 3c78708fe83d0fff994683e396e28ef259b7497b h: refs/heads/master i:   111357:
 8101bb9015b82eafdef93d632eecf1e5e68b0378   111355:
 d08e49788043762bcfe66a73ca6cc79bff2a871e   111351:
 806883963f177c1636972de169621e1c0178c7af   111343:
 bbdaa0fe5ff43f34dea50be3db96da314460e8a7   111327:
 1e09b718b20a0c0caa084634c5e5d892574c3e62   111295:
 635f6d34f61900cbdf72ec5456f1e23f955ef33d   111231:
 8ab8510ee71fb5af87b84a1dfd7b6283b42a2235   111103:
 b9bf35609ab82767317c61cbec95ac4c00b49718 v: v3

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

diff --git a/[refs] b/[refs]
index 3f292c3fe938..044600862c4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c8661e4cefdd1ddbfe7d5120f046694555d9e5c
+refs/heads/master: 3c78708fe83d0fff994683e396e28ef259b7497b
diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
index e1e2f8060563..d5930863691c 100644
--- a/trunk/drivers/net/sfc/efx.c
+++ b/trunk/drivers/net/sfc/efx.c
@@ -140,8 +140,7 @@ static void efx_fini_channels(struct efx_nic *efx);
 
 #define EFX_ASSERT_RESET_SERIALISED(efx)		\
 	do {						\
-		if ((efx->state == STATE_RUNNING) ||	\
-		    (efx->state == STATE_RESETTING))	\
+		if (efx->state == STATE_RUNNING)	\
 			ASSERT_RTNL();			\
 	} while (0)
 
@@ -1615,7 +1614,6 @@ static int efx_reset(struct efx_nic *efx)
 		goto unlock_rtnl;
 	}
 
-	efx->state = STATE_RESETTING;
 	EFX_INFO(efx, "resetting (%d)\n", method);
 
 	efx_reset_down(efx, &ecmd);
@@ -1646,7 +1644,6 @@ static int efx_reset(struct efx_nic *efx)
 		goto disable;
 
 	EFX_LOG(efx, "reset complete\n");
-	efx->state = STATE_RUNNING;
  unlock_rtnl:
 	rtnl_unlock();
 	return 0;
diff --git a/trunk/drivers/net/sfc/net_driver.h b/trunk/drivers/net/sfc/net_driver.h
index 531d939b574f..567df00090fb 100644
--- a/trunk/drivers/net/sfc/net_driver.h
+++ b/trunk/drivers/net/sfc/net_driver.h
@@ -459,8 +459,7 @@ enum nic_state {
 	STATE_INIT = 0,
 	STATE_RUNNING = 1,
 	STATE_FINI = 2,
-	STATE_RESETTING = 3, /* rtnl_lock always held */
-	STATE_DISABLED = 4,
+	STATE_DISABLED = 3,
 	STATE_MAX,
 };