From patchwork Wed May 4 12:26:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9013421 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C4FF1BF440 for ; Wed, 4 May 2016 12:26:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F3C9620381 for ; Wed, 4 May 2016 12:26:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26749203A0 for ; Wed, 4 May 2016 12:26:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750996AbcEDM0q (ORCPT ); Wed, 4 May 2016 08:26:46 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:64032 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750862AbcEDM0p (ORCPT ); Wed, 4 May 2016 08:26:45 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue003) with ESMTPA (Nemesis) id 0MSmoL-1b7SVl33ED-00RtS0; Wed, 04 May 2016 14:26:36 +0200 From: Arnd Bergmann To: Matan Barak , Leon Romanovsky , Saeed Mahameed Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, arnd@arndb.de, davem@davemloft.net, Matthew Finlay , Richard Cochran , Amir Vadai , Haggai Abramonvsky Subject: [PATCH 1/3] Revert "net/mlx5: Kconfig: Fix MLX5_EN/VXLAN build issue" Date: Wed, 4 May 2016 14:26:08 +0200 Message-Id: <1462364774-3792510-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1462364774-3792510-1-git-send-email-arnd@arndb.de> References: <1462364774-3792510-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:pPwwRkRZLamo7yPOCgttHXWlpLAWoj5O/BGPlO26/zpKLPbWdsw 5oa2NqenA/JnuHAmg6gQ0YDdwMupA2D/E9dcPNFKxGuOP06ZqHpOO37DEYMO0c8qaNLcKwm Ckekb99waic1HIfFkl8wG6LtxNfy5cu9NLmF+EfozQGKO+tE0EqI+2t4gggQonBW8ayjsK3 fy+m/Uj+K6zNdKw4vxNpA== X-UI-Out-Filterresults: notjunk:1; V01:K0:266MasPR+uc=:z+kYhRbIhXx8arH/6yAXPG fMHF+SkmyInlAmx1dXD3xx/LJ+eVBJSmjbtTp3hGg4IPPIxElsPXlVWwB9oNw9kOK25VwMV3Z KYAjaIimJZQHnJeQUzpUR38E1GYZ5UG9qEiVYuRwRbUxbQNu9SpF+CrHmRkMgSSawnMk3Qy89 jwKWjwN2nSoBxGZXWBfGvZsXrn3kGWFgmLOmen3eAp5wJKCxsvFW4ytRmOPX5HoVBeB+RiAqE 52Go6GshmIFJecOaiIW2J/3N9wBvevyxEuXtVPYE7LX3BZ26DY2YSk7wtGASBWFoIJ9CP1haC H93WcVJ5Q/aYK6igiQpgNQSL5lAvf7h8kVuxZMpivTWTfyVJs6Z/r3SswCZ7Kvs1ic5bEUe+h QVr2tow/5E6Sn+Vv1gr8fBYmY0Fr7ww9YeXNWv8SLdLTatGI48HwE6WIDkRD7Cc+azvXSUQsz nfMnioSIG08Rg3dTA+ywHYemwFW/mNnZXqGP+zPsJv8p6Ws1TgwHamtQWFL+dgw+tqS1BEN38 /E9n24TKKi1Yokx7k9wUKKxfL+setDwi4Z245OXtLqYpG8zvQlwFQGNDVDzji159kDyawr+Oo 0dcF9kel99ThbFC3UTVE24PFG0uLOdHlm4h8T6d862s5327KjgVVqXwaoRtxGrtDQBHt+EYrw UjJ7dTGXktHsm2oFpftJsrSPhEkL7hJhCDd8JxAMJOWGyRQF20W6BZiMFazhpwrbrVB4= Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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.