projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80cb9a0
)
sfc: Strengthen EFX_ASSERT_RESET_SERIALISED
author
Ben Hutchings
<bhutchings@solarflare.com>
Wed, 25 Nov 2009 16:08:52 +0000
(16:08 +0000)
committer
David S. Miller
<davem@davemloft.net>
Thu, 26 Nov 2009 23:59:04 +0000
(15:59 -0800)
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/sfc/efx.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/net/sfc/efx.c
b/drivers/net/sfc/efx.c
index 4787faaf30c1d7a1885e8ed666ade2f47de2d4aa..9f3ef387a047deea3ce7c2049d3eff74d4163f9e 100644
(file)
--- 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);
#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)