From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 03 Jan 2024 09:43:39 +0000 Subject: [PATCH] update kernel to 5.10.198 --- kernel/drivers/net/ethernet/sfc/efx_common.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/drivers/net/ethernet/sfc/efx_common.h b/kernel/drivers/net/ethernet/sfc/efx_common.h index 65513fd..c72e819 100644 --- a/kernel/drivers/net/ethernet/sfc/efx_common.h +++ b/kernel/drivers/net/ethernet/sfc/efx_common.h @@ -45,9 +45,7 @@ #define EFX_ASSERT_RESET_SERIALISED(efx) \ do { \ - if ((efx->state == STATE_READY) || \ - (efx->state == STATE_RECOVERY) || \ - (efx->state == STATE_DISABLED)) \ + if (efx->state != STATE_UNINIT) \ ASSERT_RTNL(); \ } while (0) @@ -64,7 +62,7 @@ static inline int efx_check_disabled(struct efx_nic *efx) { - if (efx->state == STATE_DISABLED || efx->state == STATE_RECOVERY) { + if (efx->state == STATE_DISABLED || efx_recovering(efx->state)) { netif_err(efx, drv, efx->net_dev, "device is disabled due to earlier errors\n"); return -EIO; -- Gitblit v1.6.2