* [PATCH] hinic: Fix l4_type parameter in hinic_task_set_tunnel_l4
@ 2018-10-29 10:51 Nathan Chancellor
2018-10-29 17:28 ` Nick Desaulniers
2018-10-30 3:43 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Nathan Chancellor @ 2018-10-29 10:51 UTC (permalink / raw)
To: Aviad Krawczyk, David S. Miller
Cc: netdev, linux-kernel, Nick Desaulniers, Nathan Chancellor
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.
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] hinic: Fix l4_type parameter in hinic_task_set_tunnel_l4
2018-10-29 10:51 [PATCH] hinic: Fix l4_type parameter in hinic_task_set_tunnel_l4 Nathan Chancellor
@ 2018-10-29 17:28 ` Nick Desaulniers
2018-10-29 17:35 ` Nick Desaulniers
2018-10-30 3:43 ` David Miller
1 sibling, 1 reply; 5+ messages in thread
From: Nick Desaulniers @ 2018-10-29 17:28 UTC (permalink / raw)
To: Nathan Chancellor; +Cc: aviad.krawczyk, David S. Miller, netdev, LKML
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] hinic: Fix l4_type parameter in hinic_task_set_tunnel_l4
2018-10-29 17:28 ` Nick Desaulniers
@ 2018-10-29 17:35 ` Nick Desaulniers
2018-10-30 3:52 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Nick Desaulniers @ 2018-10-29 17:35 UTC (permalink / raw)
To: David S. Miller; +Cc: aviad.krawczyk, netdev, LKML, Nathan Chancellor
On Mon, Oct 29, 2018 at 10:28 AM Nick Desaulniers
<ndesaulniers@google.com> wrote:
>
> 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>
David,
I'm getting bounce backs from Aviad's email address. They are listed
in MAINTAINERS for `HUAWEI ETHERNET DRIVER`. I did not see an updated
email address in .mailmap.
It seems that the last commit message mentioning them was commit
bbdc9e687fb3 ("net-next/hinic: Fix a case of Tx Queue is Stopped
forever") authored Sep 27 2017.
So I think we'll need you to merge up Nathan's patch. Is there
anything additional to mark this driver as unmaintained in
MAINTAINERS?
>
> >
> > 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
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] hinic: Fix l4_type parameter in hinic_task_set_tunnel_l4
2018-10-29 17:35 ` Nick Desaulniers
@ 2018-10-30 3:52 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2018-10-30 3:52 UTC (permalink / raw)
To: ndesaulniers; +Cc: aviad.krawczyk, netdev, linux-kernel, natechancellor
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Mon, 29 Oct 2018 10:35:01 -0700
> So I think we'll need you to merge up Nathan's patch. Is there
> anything additional to mark this driver as unmaintained in
> MAINTAINERS?
Just submit a patch stating as such if you cannot reach any of
the listed maintainters.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] hinic: Fix l4_type parameter in hinic_task_set_tunnel_l4
2018-10-29 10:51 [PATCH] hinic: Fix l4_type parameter in hinic_task_set_tunnel_l4 Nathan Chancellor
2018-10-29 17:28 ` Nick Desaulniers
@ 2018-10-30 3:43 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2018-10-30 3:43 UTC (permalink / raw)
To: natechancellor; +Cc: aviad.krawczyk, netdev, linux-kernel, ndesaulniers
From: Nathan Chancellor <natechancellor@gmail.com>
Date: Mon, 29 Oct 2018 03:51:58 -0700
> 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.
>
> Fixes: cc18a7543d2f ("net-next/hinic: add checksum offload and TSO support")
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-10-30 3:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-29 10:51 [PATCH] hinic: Fix l4_type parameter in hinic_task_set_tunnel_l4 Nathan Chancellor
2018-10-29 17:28 ` Nick Desaulniers
2018-10-29 17:35 ` Nick Desaulniers
2018-10-30 3:52 ` David Miller
2018-10-30 3:43 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).