From: Xuanqiang Luo mlx5e_ktls_set_feature_rx() has become harder to follow: the error handling is nested in the conditions and the main flow is conditional. Handle the error cases in conditionals, keep the main flow unconditional, and destroy the accel TCP flow tables in a single place. Use goto to unlock on the early return. No functional change intended. Suggested-by: Simon Horman Link: https://lore.kernel.org/all/20261029134019.GG257209@horms.kernel.org/ Signed-off-by: Xuanqiang Luo --- Only compile-tested on top of net-next 7ccc5e05043b (arm64, W=1). I do not have a crypto-enabled ConnectX NIC to run it on. .../mellanox/mlx5/core/en_accel/ktls.c | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c index 3cc1213c2f68..0f5dcd1b822e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c @@ -137,19 +137,22 @@ int mlx5e_ktls_set_feature_rx(struct net_device *netdev, bool enable) mutex_lock(&priv->state_lock); if (enable) { err = mlx5e_accel_fs_tcp_create(priv->fs); - if (!err && !priv->ktls_rx_was_enabled) { - priv->ktls_rx_was_enabled = true; - err = mlx5e_safe_reopen_channels(priv); - if (err) { - priv->ktls_rx_was_enabled = false; - mlx5e_accel_fs_tcp_destroy(priv->fs); - } + if (err || priv->ktls_rx_was_enabled) + goto out_unlock; + + priv->ktls_rx_was_enabled = true; + err = mlx5e_safe_reopen_channels(priv); + if (err) { + priv->ktls_rx_was_enabled = false; + enable = false; } - } else { - mlx5e_accel_fs_tcp_destroy(priv->fs); } - mutex_unlock(&priv->state_lock); + if (!enable) + mlx5e_accel_fs_tcp_destroy(priv->fs); + +out_unlock: + mutex_unlock(&priv->state_lock); return err; } -- 2.43.0