Re: [PATCH] hinic: Fix l4_type parameter in hinic_task_set_tunnel_l4

[Nick Desaulniers <ndesaulniers@google.com>]

On Mon, Oct 29, 2018 at 3:54 AM Nathan Chancellor
<natechancellor@gmail.com> wrote:
>
> Clang warns:
>
> drivers/net/ethernet/huawei/hinic/hinic_tx.c:392:34: error: implicit
> conversion from enumeration type 'enum hinic_l4_tunnel_type' to
> different enumeration type 'enum hinic_l4_offload_type'
> [-Werror,-Wenum-conversion]
>                 hinic_task_set_tunnel_l4(task, TUNNEL_UDP_NO_CSUM,
>                 ~~~~~~~~~~~~~~~~~~~~~~~~       ^~~~~~~~~~~~~~~~~~
> 1 error generated.
>
> It seems that hinic_task_set_tunnel_l4 was meant to take an enum of type
> hinic_l4_tunnel_type, not hinic_l4_offload_type, given both the name of
> the functions and the values used.

I agree. Thanks for fixing this up, Nathan!
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

>
> Fixes: cc18a7543d2f ("net-next/hinic: add checksum offload and TSO support")
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> ---
>  drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c | 2 +-
>  drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c b/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c
> index 967c993d5303..bbf9bdd0ee3e 100644
> --- a/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c
> +++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c
> @@ -532,7 +532,7 @@ void hinic_task_set_inner_l3(struct hinic_sq_task *task,
>  }
>
>  void hinic_task_set_tunnel_l4(struct hinic_sq_task *task,
> -                             enum hinic_l4_offload_type l4_type,
> +                             enum hinic_l4_tunnel_type l4_type,
>                               u32 tunnel_len)
>  {
>         task->pkt_info2 |= HINIC_SQ_TASK_INFO2_SET(l4_type, TUNNEL_L4TYPE) |
> diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h b/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h
> index a0dc63a4bfc7..038522e202b6 100644
> --- a/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h
> +++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h
> @@ -160,7 +160,7 @@ void hinic_task_set_inner_l3(struct hinic_sq_task *task,
>                              u32 network_len);
>
>  void hinic_task_set_tunnel_l4(struct hinic_sq_task *task,
> -                             enum hinic_l4_offload_type l4_type,
> +                             enum hinic_l4_tunnel_type l4_type,
>                               u32 tunnel_len);
>
>  void hinic_set_cs_inner_l4(struct hinic_sq_task *task,
> --
> 2.19.1
>


-- 
Thanks,
~Nick Desaulniers