From: Saeed Mahameed <saeedm@xxxxxxxxxxxx> Date: Sat, 30 Nov 2019 07:33:48 +0000 > On Wed, 2019-11-27 at 11:26 -0800, David Miller wrote: >> From: YueHaibing <yuehaibing@xxxxxxxxxx> >> Date: Wed, 27 Nov 2019 21:27:00 +0800 >> >> > If IPV6 is not set and CONFIG_MLX5_ESWITCH is y, >> > building fails: >> > >> > drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c:322:5: error: >> redefinition of mlx5e_tc_tun_create_header_ipv6 >> > int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, >> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> > In file included from >> drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c:7:0: >> > drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h:67:1: note: >> previous definition of mlx5e_tc_tun_create_header_ipv6 was here >> > mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, >> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> > >> > Use #ifdef to guard this, also move mlx5e_route_lookup_ipv6 >> > to cleanup unused warning. >> > >> > Reported-by: Hulk Robot <hulkci@xxxxxxxxxx> >> > Fixes: e689e998e102 ("net/mlx5e: TC, Stub out ipv6 tun create >> header function") >> > Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx> >> >> Saeed et al., how do you want to handle this? >> > > LGTM, I guess you can push this to net since this is dealing with a > build error ? Ok, I'll do that, thanks.