Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e279d634 authored by Shay Agroskin's avatar Shay Agroskin Committed by Saeed Mahameed
Browse files

net/mlx5e: Refine ets validation function 



Removed an error message received when configuring ETS total
bandwidth to be zero.
Our hardware doesn't support such configuration, so we shall
reject it in the driver. Nevertheless, we removed the error message
in order to eliminate error messages caused by old userspace tools
who try to pass such configuration.

Fixes: ff089191 ("net/mlx5e: Fix ETS BW check")
Signed-off-by: default avatarShay Agroskin <shayag@mellanox.com>
Reviewed-by: default avatarHuy Nguyen <huyn@mellanox.com>
Reviewed-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent e56b8ce3

drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c

+8 −9
Original line number Diff line number Diff line
@@ -275,7 +275,8 @@ int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets *ets) 
}



static int mlx5e_dbcnl_validate_ets(struct net_device *netdev,

				    struct ieee_ets *ets)

				    struct ieee_ets *ets,

				    bool zero_sum_allowed)

{

	bool have_ets_tc = false;

	int bw_sum = 0;
@@ -300,6 +301,7 @@ static int mlx5e_dbcnl_validate_ets(struct net_device *netdev, 
	}



	if (have_ets_tc && bw_sum != 100) {

		if (bw_sum || (!bw_sum && !zero_sum_allowed))

			netdev_err(netdev,

				   "Failed to validate ETS: BW sum is illegal\n");

		return -EINVAL;
@@ -316,7 +318,7 @@ static int mlx5e_dcbnl_ieee_setets(struct net_device *netdev, 
	if (!MLX5_CAP_GEN(priv->mdev, ets))

		return -EOPNOTSUPP;



	err = mlx5e_dbcnl_validate_ets(netdev, ets);

	err = mlx5e_dbcnl_validate_ets(netdev, ets, false);

	if (err)

		return err;
@@ -642,12 +644,9 @@ static u8 mlx5e_dcbnl_setall(struct net_device *netdev) 
			  ets.prio_tc[i]);

	}



	err = mlx5e_dbcnl_validate_ets(netdev, &ets);

	if (err) {

		netdev_err(netdev,

			   "%s, Failed to validate ETS: %d\n", __func__, err);

	err = mlx5e_dbcnl_validate_ets(netdev, &ets, true);

	if (err)

		goto out;

	}



	err = mlx5e_dcbnl_ieee_setets_core(priv, &ets);

	if (err) {