hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: 2a5e7a1344 ("net/mlx5e: Add dcbnl dscp to priority support")
Signed-off-by: Huy Nguyen <huyn@mellanox.com>
Cc: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Huy Nguyen 2018-08-08 15:48:08 -07:00 committed by David S. Miller
parent 816f670623
commit f280c6a1e5
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/mellanox/mlx5/core/en.h
View File

@ -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;
}; };

30
drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
View File

@ -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)) if ((app->selector != IEEE_8021QAZ_APP_SEL_DSCP) ||
return -EINVAL; (app->protocol >= MLX5E_MAX_DSCP))
if (!MLX5_DSCP_SUPPORTED(priv->mdev))
return -EINVAL;
if (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)) if ((app->selector != IEEE_8021QAZ_APP_SEL_DSCP) ||
return -EINVAL; (app->protocol >= MLX5E_MAX_DSCP))
if (!MLX5_DSCP_SUPPORTED(priv->mdev))
return -EINVAL;
if (app->protocol >= MLX5E_MAX_DSCP)
return -EINVAL; return -EINVAL;
/* Skip if no dscp app entry */ /* Skip if no dscp app entry */
@ -1146,7 +1138,7 @@ static int mlx5e_set_trust_state(struct mlx5e_priv *priv, u8 trust_state)
{ {
int err; int err;
err = mlx5_set_trust_state(priv->mdev, trust_state); err = mlx5_set_trust_state(priv->mdev, trust_state);
if (err) if (err)
return err; return err;
priv->dcbx_dp.trust_state = trust_state; priv->dcbx_dp.trust_state = trust_state;