From patchwork Mon Feb 26 09:41:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 129620 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp7393lja; Mon, 26 Feb 2018 01:42:25 -0800 (PST) X-Google-Smtp-Source: AH8x224CHc2At80BpJ+TIhxebdDpc2aXmZMZnY1Gzwo2Dge6lINdu9DVxvsvza7Is79zp7Ddv/bP X-Received: by 10.99.170.73 with SMTP id x9mr7968939pgo.393.1519638145229; Mon, 26 Feb 2018 01:42:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519638145; cv=none; d=google.com; s=arc-20160816; b=yp5GNb8jPPowDUCm7+on7i2wrRINAzfQXHbJtl8N53aVCBy5BsbtTtLgS6TNaqaK6u DLUZqmRAELgRCxThG2+peLBtqF095bMAlI2ANuoIFERdzjngVcHen9JHGMJa7yXjIxfb BoPJD8lb/uWxtvP5PuJUL9gEgX4w2bq9lBOyrOUrw0zJt/62sYni3GnRIKo3SjYjSQDT H/za/QH9LbwHkWwXzTDkH1gYr6bCnTokcy2xe9Y12mfUUXY3ZPZpAOq9BvilvDBGbYiO ODzNn5ZzmNBFvr0doOuxRyUuOfTtB9Scroj08ukaLrEpg2R2e2xeVYzz/heRbn6O0dtW r4/w== 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=eMKSrd47L5+UH/vnKTwSCP/geCBXaDgby1PQlUV9Jtg=; b=QnR0esYwpjxb7sOMpkPZNNrldbl8ri1r5qmoP8Cq2muZ01705CjOvxA4UbrX7ATKiH XRXbED9adngdEKnLaBjwrac1lcq2h4tlkoeRzPgkiwgciUldhOEyIpFyOmMJpw3OMfb8 /9AN5JQE7wHf9YUeluoRD2fyzOFEltpxm7AMi44rQI8ttj8SsnAgXIS1RZym2kh53KYi QmlsCjDoi8lSXhWQoqVhZOaL3ziS0eK7TWmXCxMG9VhsOlFAHa8qMn+1lZO0BnotSQf8 xbKCy31KHnkyB05W12zQ6MmEIJYXjFuKgQEIT5Nx5esOOcTF0oEmReK9YxlwztsE5+Lo xB2g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-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 d16si2830131pgv.331.2018.02.26.01.42.25; Mon, 26 Feb 2018 01:42:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of netdev-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 netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752377AbeBZJmV (ORCPT + 8 others); Mon, 26 Feb 2018 04:42:21 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:43637 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752007AbeBZJmQ (ORCPT ); Mon, 26 Feb 2018 04:42:16 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.129]) with ESMTPA (Nemesis) id 0MW4Oi-1fEOua1Foe-00X6hp; Mon, 26 Feb 2018 10:42:04 +0100 From: Arnd Bergmann To: "David S. Miller" , Matteo Croce Cc: Arnd Bergmann , Mika Westerberg , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [net-next] ipvlan: fix building with modular IPV6 Date: Mon, 26 Feb 2018 10:41:30 +0100 Message-Id: <20180226094159.2519438-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:kGAAr4EFWQ6FiOFgacok7AINiGQp+EsVhFhkoDskgqyYLPHv9WF Vt80cS8GNtChJ4LALrDmsrgE5uoePBoYQCLg+Uvis83bFlzneYZHJItkaESF70l7tUN8Nxk 3f3DHu/LIxh1WWy86ZNAA2iSbC/fCWFEIgiRXOrf5xcqOTh+HHt/Gt6KOhrTvJ9wKPKBgLR L/NSEwFFJMOY2Za/WSu6w== X-UI-Out-Filterresults: notjunk:1; V01:K0:QCNYtCZmCn4=:kbuOJR43I4/2Lu6t69/WM+ IcnCm0QnycOowya9g/+gSttgn9hxCMoZGYw2pQQ6XpZRl6roibyCvFEP/oXMJ4/djyPIlH8be iS+eSwW6/5Eh9dqgrCmfJVv4gq/0tnJQFp0jB7hHsD1CDqVL0y2fO6na8XXLhfm2SKcZVKjot FkYg5ot9JN9l0y/BRW+WK1c1Tcdm56M+A8vlvLRaNIZc+U6lkWkoPWH6/rB92YswsCSUnxrou NpIFXAJx7u3HjrkKoCb43KGJWxKUSGfRyxFjwN0Qmz4waOf4oT/3h2HCJP9ZnZRJMXc4DWuSm c2z42yHxxNwq0o+Tgf2AeNITO0F6U8pqVS1NxE8z27Su+bNBm+sPxYeDVqtINWd0AzoHQXSAN PUVIpiakd+XY+TexomSMF/bUDIiCGNIDAeje7uALiqRZn+v1ogNlqwx3e0PKx9I0es1rv8l57 8bNS1r1kJBJAZUwE8lLZfRJroUFUeppX7A2+MdBJnIN6G1BxxW9AGfhZc5defNJzbPT6FxtN4 9UmVqv5FRI8dhs3lmen/06Xrg/sslC+9EEdmXJBB0HFzxpoAk5F/ddgtlsJZ7w3DLiyBiJmt7 aA+A9mKEdNIyPQaHeYReRFkHaaOChbZHS8BO5p6e/NNdMGb1I3cpwt2DrfKWUvK3Vd43DKysx wCIUBR73P86VxHe0ZdZZn3Km4kvX5APYQ0k0c5F7RVHOAkXCX9V/KHlBfmd4McYkSjVFGq38T AnAv/KFvgdXyMGjVjslH7AdjwmhbRTmoCOtbyQ== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We no longer depend on IPV6, but that now causes a link error with CONFIG_IPV6=m and CONFIG_IPVLAN=y: drivers/net/ipvlan/ipvlan_core.o: In function `ipvlan_queue_xmit': ipvlan_core.c:(.text+0x1440): undefined reference to `ip6_route_output_flags' drivers/net/ipvlan/ipvlan_core.o: In function `ipvlan_l3_rcv': ipvlan_core.c:(.text+0x1818): undefined reference to `ip6_route_input_lookup' This adds back the dependency on IPV6, with the option of building without IPV6, but forcing IPVLAN to be a module when IPV6 is a module. Fixes: 94333fac44d1 ("ipvlan: drop ipv6 dependency") Signed-off-by: Arnd Bergmann --- drivers/net/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d88b78a17440..08b85215c2be 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -149,6 +149,7 @@ config MACVTAP config IPVLAN tristate "IP-VLAN support" depends on INET + depends on IPV6 || !IPV6 depends on NETFILTER select NET_L3_MASTER_DEV ---help---