Skip to content

Commit

Permalink
net/mlx5e: Fail safe tc setup
Browse files Browse the repository at this point in the history
Use the new fail-safe channels switch mechanism to set up new
tc parameters.

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
  • Loading branch information
Saeed Mahameed committed Mar 27, 2017
1 parent be7e87f commit 6f9485a
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2910,25 +2910,29 @@ int mlx5e_modify_channels_vsd(struct mlx5e_channels *chs, bool vsd)
static int mlx5e_setup_tc(struct net_device *netdev, u8 tc)
{
struct mlx5e_priv *priv = netdev_priv(netdev);
bool was_opened;
struct mlx5e_channels new_channels = {};
int err = 0;

if (tc && tc != MLX5E_MAX_NUM_TC)
return -EINVAL;

mutex_lock(&priv->state_lock);

was_opened = test_bit(MLX5E_STATE_OPENED, &priv->state);
if (was_opened)
mlx5e_close_locked(priv->netdev);
new_channels.params = priv->channels.params;
new_channels.params.num_tc = tc ? tc : 1;

priv->channels.params.num_tc = tc ? tc : 1;
if (test_bit(MLX5E_STATE_OPENED, &priv->state)) {
priv->channels.params = new_channels.params;
goto out;
}

if (was_opened)
err = mlx5e_open_locked(priv->netdev);
err = mlx5e_open_channels(priv, &new_channels);
if (err)
goto out;

mlx5e_switch_priv_channels(priv, &new_channels);
out:
mutex_unlock(&priv->state_lock);

return err;
}

Expand Down

0 comments on commit 6f9485a

Please sign in to comment.