netdev - Re: [PATCH net 2/2] net/mlx5e: Cleanup of dcbnl related fields

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 14 Aug 2018 12:52:40 +0200
From:   Håkon Bugge <haakon.bugge@...cle.com>
To:     Yuval Shaia <yuval.shaia@...cle.com>
Cc:     Saeed Mahameed <saeedm@...lanox.com>,
        "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org,
        Huy Nguyen <huyn@...lanox.com>
Subject: Re: [PATCH net 2/2] net/mlx5e: Cleanup of dcbnl related fields



> On 14 Aug 2018, at 11:01, Yuval Shaia <yuval.shaia@...cle.com> wrote:
> 
> On Wed, Aug 08, 2018 at 03:48:08PM -0700, Saeed Mahameed wrote:
>> From: Huy Nguyen <huyn@...lanox.com>
>> 
>> Remove unused netdev_registered_init/remove in en.h
>> Return ENOSUPPORT if the check MLX5_DSCP_SUPPORTED fails.
> 
> s/ENOSUPPORT/EOPNOTSUPP
> (noted by Haakon)

Sure did,

> 
>> Remove extra white space

and I also said that this has nothing to with the commit (no matter how tempting it can be) ;-)


Thxs, Håkon

>> 
>> Fixes: 2a5e7a1344f4 ("net/mlx5e: Add dcbnl dscp to priority support")
>> Signed-off-by: Huy Nguyen <huyn@...lanox.com>
>> Cc: Yuval Shaia <yuval.shaia@...cle.com>
>> Reviewed-by: Parav Pandit <parav@...lanox.com>
>> Signed-off-by: Saeed Mahameed <saeedm@...lanox.com>
>> ---
>> drivers/net/ethernet/mellanox/mlx5/core/en.h  |  2 --
>> .../ethernet/mellanox/mlx5/core/en_dcbnl.c    | 30 +++++++------------
>> 2 files changed, 11 insertions(+), 21 deletions(-)
>> 
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
>> index eb9eb7aa953a..405236cf0b04 100644
>> --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
>> @@ -858,8 +858,6 @@ struct mlx5e_profile {
>> 		mlx5e_fp_handle_rx_cqe handle_rx_cqe;
>> 		mlx5e_fp_handle_rx_cqe handle_rx_cqe_mpwqe;
>> 	} rx_handlers;
>> -	void	(*netdev_registered_init)(struct mlx5e_priv *priv);
>> -	void    (*netdev_registered_remove)(struct mlx5e_priv *priv);
>> 	int	max_tc;
>> };
>> 
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
>> index e33afa8d2417..722998d68564 100644
>> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
>> @@ -443,16 +443,12 @@ static int mlx5e_dcbnl_ieee_setapp(struct net_device *dev, struct dcb_app *app)
>> 	bool is_new;
>> 	int err;
>> 
>> -	if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP)
>> -		return -EINVAL;
>> -
>> -	if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager))
>> -		return -EINVAL;
>> -
>> -	if (!MLX5_DSCP_SUPPORTED(priv->mdev))
>> -		return -EINVAL;
>> +	if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager) ||
>> +	    !MLX5_DSCP_SUPPORTED(priv->mdev))
>> +		return -EOPNOTSUPP;
>> 
>> -	if (app->protocol >= MLX5E_MAX_DSCP)
>> +	if ((app->selector != IEEE_8021QAZ_APP_SEL_DSCP) ||
>> +	    (app->protocol >= MLX5E_MAX_DSCP))
>> 		return -EINVAL;
>> 
>> 	/* 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);
>> 	int err;
>> 
>> -	if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP)
>> -		return -EINVAL;
>> -
>> -	if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager))
>> -		return -EINVAL;
>> -
>> -	if (!MLX5_DSCP_SUPPORTED(priv->mdev))
>> -		return -EINVAL;
>> +	if  (!MLX5_CAP_GEN(priv->mdev, vport_group_manager) ||
>> +	     !MLX5_DSCP_SUPPORTED(priv->mdev))
>> +		return -EOPNOTSUPP;
>> 
>> -	if (app->protocol >= MLX5E_MAX_DSCP)
>> +	if ((app->selector != IEEE_8021QAZ_APP_SEL_DSCP) ||
>> +	    (app->protocol >= MLX5E_MAX_DSCP))
>> 		return -EINVAL;
>> 
>> 	/* 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;
>> 
>> -	err =  mlx5_set_trust_state(priv->mdev, trust_state);
>> +	err = mlx5_set_trust_state(priv->mdev, trust_state);
>> 	if (err)
>> 		return err;
>> 	priv->dcbx_dp.trust_state = trust_state;
>> -- 
>> 2.17.0
>>