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

Commit 33e21c59 authored by Huy Nguyen's avatar Huy Nguyen Committed by David S. Miller
Browse files

net/mlx5e: remove IEEE/CEE mode check when setting DCBX mode 



Currently, the function setdcbx fails if the request dcbx mode
is either IEEE or CEE. We remove the IEEE/CEE mode check because
we support both IEEE and CEE interfaces.

Fixes: 3a6a931d ("net/mlx5e: Support DCBX CEE API")
Signed-off-by: default avatarHuy Nguyen <huyn@mellanox.com>
Reviewed-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d47f6c8

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

+5 −5
Original line number Diff line number Diff line
@@ -302,6 +302,9 @@ static u8 mlx5e_dcbnl_setdcbx(struct net_device *dev, u8 mode) 
	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5e_dcbx *dcbx = &priv->dcbx;



	if (mode & DCB_CAP_DCBX_LLD_MANAGED)

		return 1;



	if ((!mode) && MLX5_CAP_GEN(priv->mdev, dcbx)) {

		if (dcbx->mode == MLX5E_DCBX_PARAM_VER_OPER_AUTO)

			return 0;
@@ -315,13 +318,10 @@ static u8 mlx5e_dcbnl_setdcbx(struct net_device *dev, u8 mode) 
		return 1;

	}



	if (mlx5e_dcbnl_switch_to_host_mode(netdev_priv(dev)))

	if (!(mode & DCB_CAP_DCBX_HOST))

		return 1;



	if ((mode & DCB_CAP_DCBX_LLD_MANAGED) ||

	    !(mode & DCB_CAP_DCBX_VER_CEE) ||

	    !(mode & DCB_CAP_DCBX_VER_IEEE) ||

	    !(mode & DCB_CAP_DCBX_HOST))

	if (mlx5e_dcbnl_switch_to_host_mode(netdev_priv(dev)))

		return 1;



	return 0;