From: Arnd Bergmann <arnd@arndb.de>
To: Matan Barak <matanb@mellanox.com>,
Leon Romanovsky <leonro@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>
Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org,
linux-kernel@vger.kernel.org, arnd@arndb.de, davem@davemloft.net,
Matthew Finlay <matt@mellanox.com>,
Richard Cochran <richardcochran@gmail.com>,
Amir Vadai <amirv@mellanox.com>,
Haggai Abramonvsky <hagaya@mellanox.com>
Subject: [PATCH 1/3] Revert "net/mlx5: Kconfig: Fix MLX5_EN/VXLAN build issue"
Date: Wed, 4 May 2016 14:26:08 +0200 [thread overview]
Message-ID: <1462364774-3792510-2-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1462364774-3792510-1-git-send-email-arnd@arndb.de>
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>
---
drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
index 559d11a443bc..1cf722eba607 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@ -14,7 +14,6 @@ config MLX5_CORE_EN
bool "Mellanox Technologies ConnectX-4 Ethernet support"
depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE
select PTP_1588_CLOCK
- select VXLAN if MLX5_CORE=y
default n
---help---
Ethernet support in Mellanox Technologies ConnectX-4 NIC.
--
2.7.0
next prev parent reply other threads:[~2016-05-04 12:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-04 12:26 [PATCH 0/3] net/mlx5e: Kconfig fixes Arnd Bergmann
2016-05-04 12:26 ` Arnd Bergmann [this message]
2016-05-04 12:31 ` [PATCH 2/3] net/mlx5e: make VXLAN support conditional Arnd Bergmann
2016-05-05 16:44 ` Saeed Mahameed
2016-05-05 18:09 ` Arnd Bergmann
2016-05-06 19:35 ` David Miller
2016-05-08 11:58 ` Saeed Mahameed
2016-05-12 8:15 ` Arnd Bergmann
2016-05-06 20:12 ` Alexander Duyck
2016-05-04 12:32 ` [PATCH 3/3] net/mlx5e: don't build RFS without ethernet Arnd Bergmann
2016-05-04 13:09 ` Saeed Mahameed
2016-05-04 14:23 ` Arnd Bergmann
2016-05-04 14:55 ` Saeed Mahameed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462364774-3792510-2-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=amirv@mellanox.com \
--cc=davem@davemloft.net \
--cc=hagaya@mellanox.com \
--cc=leonro@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=matanb@mellanox.com \
--cc=matt@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=saeedm@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox