net/mlx5e: Cleanup safe switch channels API by passing params

[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 0b0273fac6e3acbb0f1c0c8cc7657d15b46349d8..a4c8d8d00d5a444578c37ee0e005c0ea5982ef43 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
@@ -1149,24 +1149,23 @@ 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 = {};
+       struct mlx5e_params new_params;
        bool reset = true;
        int err;
 
        mutex_lock(&priv->state_lock);
 
-       new_channels.params = priv->channels.params;
-       mlx5e_params_calc_trust_tx_min_inline_mode(priv->mdev, &new_channels.params,
+       new_params = priv->channels.params;
+       mlx5e_params_calc_trust_tx_min_inline_mode(priv->mdev, &new_params,
                                                   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)
+       if (new_params.tx_min_inline_mode == priv->channels.params.tx_min_inline_mode)
                reset = false;
 
-       err = mlx5e_safe_switch_channels(priv, &new_channels,
-                                        mlx5e_update_trust_state_hw,
-                                        &trust_state, reset);
+       err = mlx5e_safe_switch_params(priv, &new_params,
+                                      mlx5e_update_trust_state_hw,
+                                      &trust_state, reset);
 
        mutex_unlock(&priv->state_lock);