aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-11-25 11:08:52 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-26 18:59:04 -0500
commit332c1ce9e7b0f9285cba0cf3d32bad87a4f8e40a (patch)
tree543d0dddadb436ba6fc4f58ceb9e322796cd6ad3 /drivers
parent80cb9a0f7f381e1c0e9f6dabec6e67db0dd3a0d9 (diff)
sfc: Strengthen EFX_ASSERT_RESET_SERIALISED
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sfc/efx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 4787faaf30c1..9f3ef387a047 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -186,7 +186,8 @@ static void efx_fini_channels(struct efx_nic *efx);
186 186
187#define EFX_ASSERT_RESET_SERIALISED(efx) \ 187#define EFX_ASSERT_RESET_SERIALISED(efx) \
188 do { \ 188 do { \
189 if (efx->state == STATE_RUNNING) \ 189 if ((efx->state == STATE_RUNNING) || \
190 (efx->state == STATE_DISABLED)) \
190 ASSERT_RTNL(); \ 191 ASSERT_RTNL(); \
191 } while (0) 192 } while (0)
192 193