diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-25 16:08:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-26 15:59:04 -0800 |
| commit | 332c1ce9e7b0f9285cba0cf3d32bad87a4f8e40a (patch) | |
| tree | 543d0dddadb436ba6fc4f58ceb9e322796cd6ad3 /drivers/net | |
| parent | 80cb9a0f7f381e1c0e9f6dabec6e67db0dd3a0d9 (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/net')
| -rw-r--r-- | drivers/net/sfc/efx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 4787faaf30c..9f3ef387a04 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); #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) |