net/mlx5e: Refactor on-the-fly configuration changes

[sfrench/cifs-2.6.git] / drivers / net / ethernet / mellanox / mlx5 / core / en_dcbnl.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
index 9d4d83159603665b539d4e881b0d28f269998ebc..0b0273fac6e3acbb0f1c0c8cc7657d15b46349d8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
@@ -1150,7 +1150,8 @@ static int mlx5e_update_trust_state_hw(struct mlx5e_priv *priv, void *context)
 static int mlx5e_set_trust_state(struct mlx5e_priv *priv, u8 trust_state)
 {
        struct mlx5e_channels new_channels = {};
-       int err = 0;
+       bool reset = true;
+       int err;
 
        mutex_lock(&priv->state_lock);
 
@@ -1160,16 +1161,13 @@ static int mlx5e_set_trust_state(struct mlx5e_priv *priv, u8 trust_state)
 
        /* Skip if tx_min_inline is the same */
        if (new_channels.params.tx_min_inline_mode ==
-           priv->channels.params.tx_min_inline_mode) {
-               err = mlx5e_update_trust_state_hw(priv, &trust_state);
-               goto out;
-       }
+           priv->channels.params.tx_min_inline_mode)
+               reset = false;
 
        err = mlx5e_safe_switch_channels(priv, &new_channels,
                                         mlx5e_update_trust_state_hw,
-                                        &trust_state);
+                                        &trust_state, reset);
 
-out:
        mutex_unlock(&priv->state_lock);
 
        return err;