diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-25 17:08:52 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-27 00:59:04 +0100 |
| commit | 332c1ce9e7b0f9285cba0cf3d32bad87a4f8e40a (patch) | |
| tree | 543d0dddadb436ba6fc4f58ceb9e322796cd6ad3 /drivers/net/sfc | |
| parent | sfc: Treat all MAC registers as 128-bit (diff) | |
| download | linux-332c1ce9e7b0f9285cba0cf3d32bad87a4f8e40a.tar.xz linux-332c1ce9e7b0f9285cba0cf3d32bad87a4f8e40a.zip | |
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/sfc')
| -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 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); #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) |