.. | .. |
---|
45 | 45 | |
---|
46 | 46 | #define EFX_ASSERT_RESET_SERIALISED(efx) \ |
---|
47 | 47 | do { \ |
---|
48 | | - if ((efx->state == STATE_READY) || \ |
---|
49 | | - (efx->state == STATE_RECOVERY) || \ |
---|
50 | | - (efx->state == STATE_DISABLED)) \ |
---|
| 48 | + if (efx->state != STATE_UNINIT) \ |
---|
51 | 49 | ASSERT_RTNL(); \ |
---|
52 | 50 | } while (0) |
---|
53 | 51 | |
---|
.. | .. |
---|
64 | 62 | |
---|
65 | 63 | static inline int efx_check_disabled(struct efx_nic *efx) |
---|
66 | 64 | { |
---|
67 | | - if (efx->state == STATE_DISABLED || efx->state == STATE_RECOVERY) { |
---|
| 65 | + if (efx->state == STATE_DISABLED || efx_recovering(efx->state)) { |
---|
68 | 66 | netif_err(efx, drv, efx->net_dev, |
---|
69 | 67 | "device is disabled due to earlier errors\n"); |
---|
70 | 68 | return -EIO; |
---|