From patchwork Tue Feb 28 21:12:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9596971 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4CB7460471 for ; Tue, 28 Feb 2017 21:36:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F2C428587 for ; Tue, 28 Feb 2017 21:36:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 323CB28593; Tue, 28 Feb 2017 21:36:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9472C28587 for ; Tue, 28 Feb 2017 21:36:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751888AbdB1Vfj (ORCPT ); Tue, 28 Feb 2017 16:35:39 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:58203 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751601AbdB1Vey (ORCPT ); Tue, 28 Feb 2017 16:34:54 -0500 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0MPKo0-1ceRMI0RJA-004SZJ; Tue, 28 Feb 2017 22:12:34 +0100 From: Arnd Bergmann To: Saeed Mahameed , Matan Barak , Leon Romanovsky Cc: Arnd Bergmann , "David S. Miller" , Or Gerlitz , Matthew Finlay , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net/mlx5e: add IPV6 dependency Date: Tue, 28 Feb 2017 22:12:04 +0100 Message-Id: <20170228211226.3655526-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:8dp4vZ+NILepEEm+rJZphvUcsbIG/Y1enZa7+9oDfW7WWtxyVle 4EFLJAjWHYaAT+PMzZkZAfiglMS2r/kTV6VGwQJmi7/3FOZsZHby70AHpg7ZkvC3ttdvssk IRwE75QvQgGy0i/+YLKWUbJKU/7QMiMu/eV4GSc3qFCMslce+AWzol9yB3xKPJdeGI7DllU YvoU5qpAMMtjgrjKSt+Ow== X-UI-Out-Filterresults: notjunk:1; V01:K0:KNHRUBiZ+QU=:YDWEywMHt7PBMuL/mMuFxE vrXxmsWXyRLLBt+wAow8jT17DrCLdS/vM4/4AV1B82h8hUCEQlk+mgjQBU3shQHIxH3praliv rIMDPoQnkM10CVbn5H6EWVQkZ9CMXdgJAn7HCs5zqhTYDCB30KWlGD1fmdqccajV6jcZIV3cj g9VZl8xz79cRE2aI+HmGnVUtPCurbFk1j/ZZVCBdJR/oOASl56GXih7iz5S79sifTO17q37na XB4v8JXXJa0/W++D2/AEh49XZ6LLDUDTcRos3kz2E5+GpbiUwD84ELEpCNgojK7ammGP7VyfD pfT9KYBSF0FxE0s3+eXAK2zcLB5iowVzNBzde59jFX64UHG9U4Lmt/aGb1anoU5qCxA2FJshC U/n5wxqPxsy3vo8+x93oYNboyfzK6KalWU3xQb/g3kkN4u4s2mitT9xgAUe2XqC4UlM1GQolk hp+nBM/qpQxDsUbCbaAiWAe1ZTa9DpRp/xrEaU1lLJywMUkDVrSKFMUla/ISS3C6+AUYLXJZ4 wF+4FnbzD3RbNzV9JnsSdLtRpm9Uy8wE1VH9pX07phOSAmAbBIYCjKjDfYl5wHWshx7LnaEpI ZzfvmUb2Gxd39sEUwojKoFgpD7O7/KnO4K7fuujy7y3QqbPQ21niDf9hh/l2pYs7vYtA0BOt0 6MgPLNPmsY9MVTocVGhiFC9SQf5ZVhny0H4Df9SGV6wxn7ZpvuQlUoPpeNVdK+/eQ5Ug= Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The ethernet support now calls directly into the ipv6 core code, which fails if IPV6 is a loadable module but mlx5 is built-in: drivers/net/ethernet/mellanox/mlx5/core/en_tc.o: In function `mlx5e_create_encap_header_ipv6': en_tc.c:(.text.mlx5e_create_encap_header_ipv6+0x110): undefined reference to `ip6_route_output_flags' This adds a dependency to ensure that MLX5_CORE_EN can only be built if we are able link the kernel successfully. The downside is that the ethernet option can be hidden. Alternatively we could make MLX5_CORE depend on "IPV6 || !IPV6", which would force MLX5_CORE to be a module when IPV6 is, including in configurations where we don't use the ethernet support at all. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index ddb4ca4ff930..117170014e88 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -14,6 +14,7 @@ config MLX5_CORE config MLX5_CORE_EN bool "Mellanox Technologies ConnectX-4 Ethernet support" depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE + depends on IPV6=y || IPV6=n || MLX5_CORE=m imply PTP_1588_CLOCK default n ---help---