[Intel-wired-lan] [PATCH net-next] ice: return proper error code in ice_add_adv_rule

[Paul Menzel <pmenzel@molgen.mpg.de>]

Dear Wojciech,


Thank you for your patch.

Am 01.04.22 um 11:59 schrieb Wojciech Drewek:
> When number of words exceeds ICE_MAX_CHAIN_WORDS, -ENOSPC
> should be returned not -EINVAL. Do not overwrite this
> error code in ice_add_tc_flower_adv_fltr.

Maybe make that two commits?

Also for the subject, instead of ?proper error code?, just name it. Maybe:

> ice: ice_add_adv_rule: return ENOSPC when exceeding ICE_MAX_CHAIN_WORDS


Kind regards,

Paul


> Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com>
> Suggested-by: Marcin Szycik <marcin.szycik@linux.intel.com>
> Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
> ---
>   drivers/net/ethernet/intel/ice/ice_switch.c | 5 ++++-
>   drivers/net/ethernet/intel/ice/ice_tc_lib.c | 1 -
>   2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
> index ed7130b7abfe..01f7029ec22f 100644
> --- a/drivers/net/ethernet/intel/ice/ice_switch.c
> +++ b/drivers/net/ethernet/intel/ice/ice_switch.c
> @@ -5992,9 +5992,12 @@ ice_add_adv_rule(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
>   				word_cnt++;
>   	}
>   
> -	if (!word_cnt || word_cnt > ICE_MAX_CHAIN_WORDS)
> +	if (!word_cnt)
>   		return -EINVAL;
>   
> +	if (word_cnt > ICE_MAX_CHAIN_WORDS)
> +		return -ENOSPC;
> +
>   	/* locate a dummy packet */
>   	profile = ice_find_dummy_packet(lkups, lkups_cnt, rinfo->tun_type);
>   
> diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
> index f3a51597f7f6..4cee0fcf91d1 100644
> --- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c
> +++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
> @@ -748,7 +748,6 @@ ice_add_tc_flower_adv_fltr(struct ice_vsi *vsi,
>   	} else if (ret) {
>   		NL_SET_ERR_MSG_MOD(tc_fltr->extack,
>   				   "Unable to add filter due to error");
> -		ret = -EIO;
>   		goto exit;
>   	}
>