]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Revert "net/mlx5: Kconfig: Fix MLX5_EN/VXLAN build issue"
authorArnd Bergmann <arnd@arndb.de>
Sun, 8 May 2016 11:55:24 +0000 (14:55 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 May 2016 04:21:07 +0000 (00:21 -0400)
commit7fd7406d9c7e3c6f235aec224a811dc0fd29e049
tree98302d7432778c3ba23af5eb5aa771c74e0d0284
parent8acca6acebd07b238af2e61e4f7d55e6232c7e3a
Revert "net/mlx5: Kconfig: Fix MLX5_EN/VXLAN build issue"

This reverts commit 69976fb1045850a742deb9790ea49cbc6f497531.

We cannot select VXLAN when IPv4 support is disabled, that just gives
us additional build errors, including:

warning: (MLX5_CORE_EN) selects VXLAN which has unmet direct dependencies (NETDEVICES && NET_CORE && INET)
In file included from ../drivers/net/vxlan.c:36:0:
include/net/udp_tunnel.h: In function 'udp_tunnel_handle_offloads':
include/net/udp_tunnel.h:112:9: error: implicit declaration of function 'iptunnel_handle_offloads' [-Werror=implicit-function-declaration]
  return iptunnel_handle_offloads(skb, type);
         ^~~~~~~~~~~~~~~~~~~~~~~~

I'm sending a proper fix for the original bug in a separate patch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx5/core/Kconfig