From patchwork Wed Oct 11 13:55:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 115554 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp654333edb; Wed, 11 Oct 2017 06:55:59 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDOehYpX1JzdvzJeb/9cEEpZp+/ku8evE1rJV41bHHmj1bNRbEA/ZVilAMXIPBsTISYwH6z X-Received: by 10.159.207.129 with SMTP id z1mr8049990plo.174.1507730159845; Wed, 11 Oct 2017 06:55:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507730159; cv=none; d=google.com; s=arc-20160816; b=FUnVpYDzO89vEVml0fCCp9TEHY73KVe2sJOjU/UYcfceMbwBvcSNFOb+kfrGsEdEXp yvsmVMAgJYO723AXdBVyePOteHKPsJXZ7iIFbVv6dwRRDh2e50Zs7JT7BumBkBY80fUy Vvs3wAYz6W4Cwx/905s1kl8rbE0xcsi5csMDvs0xpW31GUjh63y9jvu+GuLkNBnCMImk f21d9oKjTGDBfbz8OpKXWN+kI4pvJpqmYeQeh9Ys3idPppI+iwTkoXFvl1POz8dvurTf 00bpRM3UD/58hFym2vnmFktp3Gan+TeUG8bxKIc0pP57WElQDxXuhhfxDIgpHs+IRPE4 /whw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=XCl3xbhWLB+nJIL81dgOAEiZJHA4rzLgYNMf2ctZddo=; b=UPBT52xM5lkzLYHuRf5mn2AtYY73mvvs39IpNP/KItTNtIlsTVQtHYLAH2rLJlX16W GnpzL9NroRIU8x/Pd2kF1L1D0E70vsXZU/GuYJXFKWrxEYrK1N7C0OTg7Q9/JjUuu75D dagMedg/+rfhdQPvIkvLleCueFbDVO+RgkMHBQnYPR6tSLsZ4n6Nm5nCWWLA4imRql6R DgHCEu6fzGWr0ATDUauzECLHW08EgrfjRHOwIVRS/xOlElNynipSNreSW205WlzNEMUo 8plZGKYs+IoOjxscgsF3N/Xt4SF3sakQOWbdEPuXB/IB9HYkIaX1dNSsR2MMyeQXVCVP ReIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 198si10318262pge.119.2017.10.11.06.55.59; Wed, 11 Oct 2017 06:55:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757788AbdJKNz5 (ORCPT + 26 others); Wed, 11 Oct 2017 09:55:57 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:57156 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757163AbdJKNzy (ORCPT ); Wed, 11 Oct 2017 09:55:54 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.129]) with ESMTPA (Nemesis) id 0LoNd0-1dM5uw2OcM-00gUFk; Wed, 11 Oct 2017 15:55:48 +0200 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [net-next] ip_tunnel: fix building with NET_IP_TUNNEL=m Date: Wed, 11 Oct 2017 15:55:31 +0200 Message-Id: <20171011135546.3536829-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:iy4AIulVxyVhdXAgJLQmBcUID2+Yx1nBShy34Axf25T3ak6mEWO dl+0VYTJ35+w+p3myJ/8Wf3aasn3FltTrdU2TPObdFeEPMMWbc6KyfO6EACvxcmgCLaWq6t gI8GqkhhD+cPqMy/tlps6qCPr0ttVByzBf8MO3hEZRCGZl9Rk3MydzFvPTOwkXCYewMRTkC MLmDbmM5MvsIiIA9NeMpA== X-UI-Out-Filterresults: notjunk:1; V01:K0:zDofJqWR9YE=:jBDwXSSWJnRjDax/ZnYabZ jc/F0DebXfTFBlbHZIdgmooh5grPY7EdA8Qw6dR+ZKScRCV+0my3QEzwTJ+nDRUmD/J4OM9MO XSuXs+gQ2S8qfX4VUzApC1Kas+7dvPqrCY1C9EaMimPqPIKuCE7rvwOU6NVs8REIkEEUHNxvZ UZsSW66li+JNX5YOPn2DjWnxxwjnI0t2oMMnfTqzzCqEYbFJpQVmI1bOFQvefmHDgYjTkDuuR K4NYgBhh9pOZa/Y0asLZ3nsLmv7vSiAHXNpoocw1mAcrVNhrM1TfwpxnEMzPsudeVrM3FjesN v0jxwisFyW44gzW+1vuLzaOpFrmPe3vk8e4FAjKunhSz9OB1EPPteFrhrZwWDnSN9AuFUWI9w jV6gd/bZBg1ZGiaUiE5ya3tuDnbVOgAolMUuh3gf4hy+0U2QTujveoXNJuL7vUAWBiU4HR0QG 0kI116b33B2RiaqR7BnX0Poec/ZkjFGspTakgr0vBuHKkD4GbaUcbACInxs2x4/0qVLK5TVU3 qWZvCCU2me53UoZK5hKuToAyKaipdKAGSISwIX6s+oYy+spOiqyh+bdng/SBlbHBEE98VLygW U3Eq6dNx9BTJmqY46LGf2AHg7v42h8BpiluhbHgYNmBC2LiuZSD5e7wZqqHGuTkSbdOSzuqxR urCUIOR7lVCUMQAyoBEXb9ST+S8bpPQrfRjMAMeJYLlxhorse6Ee4GNdu6aslOwluKnLdN1v6 UpnUFN1zZ/zGKkCqMOtEQwDJuwp4Ij+Ji2Uxcw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When af_mpls is built-in but the tunnel support is a module, we get a link failure: net/mpls/af_mpls.o: In function `mpls_init': af_mpls.c:(.init.text+0xdc): undefined reference to `ip_tunnel_encap_add_ops' This adds a Kconfig statement to prevent the broken configuration and force mpls to be a module as well in this case. Fixes: bdc476413dcd ("ip_tunnel: add mpls over gre support") Signed-off-by: Arnd Bergmann --- net/mpls/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 Acked-by: Amine Kherbouche diff --git a/net/mpls/Kconfig b/net/mpls/Kconfig index 5c467ef97311..801ea9098387 100644 --- a/net/mpls/Kconfig +++ b/net/mpls/Kconfig @@ -24,6 +24,7 @@ config NET_MPLS_GSO config MPLS_ROUTING tristate "MPLS: routing support" + depends on NET_IP_TUNNEL || NET_IP_TUNNEL=n ---help--- Add support for forwarding of mpls packets.