Skip to content

Commit

Permalink
hinic: Fix l4_type parameter in hinic_task_set_tunnel_l4
Browse files Browse the repository at this point in the history
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: cc18a75 ("net-next/hinic: add checksum offload and TSO support")
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Nathan Chancellor authored and David S. Miller committed Oct 30, 2018
1 parent e2d00e6 commit 6e29464
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 6e29464

Please sign in to comment.