diff mbox series

[net-next,1/2] mlx5: steering: use correct enum type

Message ID 20190909195024.3268499-1-arnd@arndb.de
State New
Headers show
Series [net-next,1/2] mlx5: steering: use correct enum type | expand

Commit Message

Arnd Bergmann Sept. 9, 2019, 7:50 p.m. UTC
The newly added code triggers a harmless warning with
clang:

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1080:9: error: implicit conversion from enumeration type 'enum mlx5_reformat_ctx_type' to different enumeration type 'enum mlx5dr_action_type' [-Werror,-Wenum-conversion]
                        rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL;
                           ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1084:51: error: implicit conversion from enumeration type 'enum mlx5dr_action_type' to different enumeration type 'enum mlx5_reformat_ctx_type' [-Werror,-Wenum-conversion]
                ret = mlx5dr_cmd_create_reformat_ctx(dmn->mdev, rt, data_sz, data,
                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~            ^~

Change it to use mlx5_reformat_ctx_type instead of mlx5dr_action_type.

Fixes: 9db810ed2d37 ("net/mlx5: DR, Expose steering action functionality")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.0

Comments

Nathan Chancellor Sept. 9, 2019, 7:55 p.m. UTC | #1
On Mon, Sep 09, 2019 at 09:50:08PM +0200, Arnd Bergmann wrote:
> The newly added code triggers a harmless warning with

> clang:

> 

> drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1080:9: error: implicit conversion from enumeration type 'enum mlx5_reformat_ctx_type' to different enumeration type 'enum mlx5dr_action_type' [-Werror,-Wenum-conversion]

>                         rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL;

>                            ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

> drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1084:51: error: implicit conversion from enumeration type 'enum mlx5dr_action_type' to different enumeration type 'enum mlx5_reformat_ctx_type' [-Werror,-Wenum-conversion]

>                 ret = mlx5dr_cmd_create_reformat_ctx(dmn->mdev, rt, data_sz, data,

>                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~            ^~

> 

> Change it to use mlx5_reformat_ctx_type instead of mlx5dr_action_type.

> 

> Fixes: 9db810ed2d37 ("net/mlx5: DR, Expose steering action functionality")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


I sent the same fix a couple of days ago:

https://lore.kernel.org/netdev/20190905014733.17564-1-natechancellor@gmail.com/

I don't care which patch goes in since they are the same thing so:

Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Nick Desaulniers Sept. 9, 2019, 9:14 p.m. UTC | #2
On Mon, Sep 9, 2019 at 12:55 PM Nathan Chancellor
<natechancellor@gmail.com> wrote:
>

> On Mon, Sep 09, 2019 at 09:50:08PM +0200, Arnd Bergmann wrote:

> > The newly added code triggers a harmless warning with

> > clang:

> >

> > drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1080:9: error: implicit conversion from enumeration type 'enum mlx5_reformat_ctx_type' to different enumeration type 'enum mlx5dr_action_type' [-Werror,-Wenum-conversion]

> >                         rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL;

> >                            ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

> > drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1084:51: error: implicit conversion from enumeration type 'enum mlx5dr_action_type' to different enumeration type 'enum mlx5_reformat_ctx_type' [-Werror,-Wenum-conversion]

> >                 ret = mlx5dr_cmd_create_reformat_ctx(dmn->mdev, rt, data_sz, data,

> >                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~            ^~

> >

> > Change it to use mlx5_reformat_ctx_type instead of mlx5dr_action_type.

> >

> > Fixes: 9db810ed2d37 ("net/mlx5: DR, Expose steering action functionality")

> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

>

> I sent the same fix a couple of days ago:

>

> https://lore.kernel.org/netdev/20190905014733.17564-1-natechancellor@gmail.com/

>

> I don't care which patch goes in since they are the same thing so:

>

> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>


GCC recently gained support (via me scanning the commit logs for an
unrelated feature) for -Wenum-warnings (though I think it's off by
default) so hopefully these kinds of issues will taper off over time.
-- 
Thanks,
~Nick Desaulniers
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c
index a02f87f85c17..7d81a7735de5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c
@@ -1074,7 +1074,7 @@  dr_action_create_reformat_action(struct mlx5dr_domain *dmn,
 	case DR_ACTION_TYP_L2_TO_TNL_L2:
 	case DR_ACTION_TYP_L2_TO_TNL_L3:
 	{
-		enum mlx5dr_action_type rt;
+		enum mlx5_reformat_ctx_type rt;
 
 		if (action->action_type == DR_ACTION_TYP_L2_TO_TNL_L2)
 			rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL;