]> git.baikalelectronics.ru Git - kernel.git/commit
net/mlx5e: Fix build error without IPV6
authorYueHaibing <yuehaibing@huawei.com>
Wed, 27 Nov 2019 13:27:00 +0000 (21:27 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 30 Nov 2019 17:43:40 +0000 (09:43 -0800)
commited79011acaef7a8930f789815cd2fae08a2dded3
tree4a6eb57ed1ffa304385f42af3bb20b9841f06e07
parent1c3c710f3eb677d973b2c8dcbda0ee8460d07062
net/mlx5e: Fix build error without IPV6

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@huawei.com>
Fixes: 668171ae948e ("net/mlx5e: TC, Stub out ipv6 tun create header function")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c