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

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

net/mlx5e: Cleanup of dcbnl related fields 



Remove unused netdev_registered_init/remove in en.h
Return ENOSUPPORT if the check MLX5_DSCP_SUPPORTED fails.
Remove extra white space

Fixes: 2a5e7a13 ("net/mlx5e: Add dcbnl dscp to priority support")
Signed-off-by: default avatarHuy Nguyen <huyn@mellanox.com>
Cc: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 816f6706

drivers/net/ethernet/mellanox/mlx5/core/en.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -858,8 +858,6 @@ struct mlx5e_profile { 
		mlx5e_fp_handle_rx_cqe handle_rx_cqe;

		mlx5e_fp_handle_rx_cqe handle_rx_cqe;

		mlx5e_fp_handle_rx_cqe handle_rx_cqe_mpwqe;

		mlx5e_fp_handle_rx_cqe handle_rx_cqe_mpwqe;

	} rx_handlers;

	} rx_handlers;

	void	(*netdev_registered_init)(struct mlx5e_priv *priv);

	void    (*netdev_registered_remove)(struct mlx5e_priv *priv);

	int	max_tc;

	int	max_tc;

};

};

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

+11 −19
Original line number Original line Diff line number Diff line
@@ -443,16 +443,12 @@ static int mlx5e_dcbnl_ieee_setapp(struct net_device *dev, struct dcb_app *app) 
	bool is_new;

	bool is_new;

	int err;

	int err;





	if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP)

	if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager) ||

		return -EINVAL;

	    !MLX5_DSCP_SUPPORTED(priv->mdev))



		return -EOPNOTSUPP;

	if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager))

		return -EINVAL;



	if (!MLX5_DSCP_SUPPORTED(priv->mdev))

		return -EINVAL;





	if (app->protocol >= MLX5E_MAX_DSCP)

	if ((app->selector != IEEE_8021QAZ_APP_SEL_DSCP) ||

	    (app->protocol >= MLX5E_MAX_DSCP))

		return -EINVAL;

		return -EINVAL;





	/* Save the old entry info */

	/* Save the old entry info */
@@ -500,16 +496,12 @@ static int mlx5e_dcbnl_ieee_delapp(struct net_device *dev, struct dcb_app *app) 
	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5e_priv *priv = netdev_priv(dev);

	int err;

	int err;





	if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP)

	if  (!MLX5_CAP_GEN(priv->mdev, vport_group_manager) ||

		return -EINVAL;

	     !MLX5_DSCP_SUPPORTED(priv->mdev))



		return -EOPNOTSUPP;

	if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager))

		return -EINVAL;



	if (!MLX5_DSCP_SUPPORTED(priv->mdev))

		return -EINVAL;





	if (app->protocol >= MLX5E_MAX_DSCP)

	if ((app->selector != IEEE_8021QAZ_APP_SEL_DSCP) ||

	    (app->protocol >= MLX5E_MAX_DSCP))

		return -EINVAL;

		return -EINVAL;





	/* Skip if no dscp app entry */

	/* Skip if no dscp app entry */