From patchwork Tue May 3 15:19:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102392 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp653992qge; Tue, 3 May 2016 08:21:14 -0700 (PDT) X-Received: by 10.66.164.165 with SMTP id yr5mr4277346pab.133.1462288874047; Tue, 03 May 2016 08:21:14 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a141si4835433pfa.80.2016.05.03.08.21.13; Tue, 03 May 2016 08:21:14 -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 S933720AbcECPVH (ORCPT + 29 others); Tue, 3 May 2016 11:21:07 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:61361 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933318AbcECPU6 (ORCPT ); Tue, 3 May 2016 11:20:58 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0M8hRj-1btRlf4Aux-00wERY; Tue, 03 May 2016 17:20:29 +0200 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , Tom Herbert , Thomas Egerer , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] gre6: add Kconfig dependency for NET_IPGRE_DEMUX Date: Tue, 3 May 2016 17:19:57 +0200 Message-Id: <1462288817-721172-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:UTIWFdELWLCP38CXfFWJIBcJH4KHp+veObI9EdfvTS3Ud+yarBh KnlUSPgAMZC+riYL5pZN3LGuvUPg5MXIsHKGAElQVJh/21gQPXnErtVAvy8vXfgvoHXGsLb Kf9sFo1R7X/fDkVXv8ZnCsGL8rHyRDL0PLzUM+PTqnuPTwewAn+89fuiMmjPQdoYLDo9/QY h30+QzuISlnRmSATdE/4w== X-UI-Out-Filterresults: notjunk:1; V01:K0:pI2GOteTo2M=:OBEi9tKofJBddh44Hc++1v iFoLE8Dma1d4E+ucgSg6HAypoDzEdyNsPu2cR9CQhTVSkBHJbhZWGONyyDJQu4sp7NQdN91B/ GJ/ZoJUhTX9Yd0mCBdqDh4qDxkdKnR/UVsKFRDW7SF3g2fNeO/836a+SbVSt3xfYnht/QWZKu OQKvv4bWO5WDX3sU7gCMXCD13SFQgZSnJNnDFWLbn4TEyAxN+sMnr7Qr18UMuewO5YDSMFpMd vmemR3l4o4AhWHWfkwfRvbZANKAoLHezzPmU7SJo3eq6ApcUWGxJ5cphwfWdkeGe1Jk+Xtr8a m7tymRaMiaWWWwJqKYWTkqMsizh0/mykpk+sIyS28OrvvDecmm/g0QDLyv5Df0TJ/xmYT4+PM zOJUJnJqlxVg2W72qy04EAnuDTZtv/iRIsUU/WvzKdvPITBrnLfC2xMUhFEEVZwjEHVN5YccB c3LcIKfPQS3+LF8gmCiDGC4142pUcY+CPCSJGxTTTdCr2D4jm4OLEnXDcgpCTW0MGzjhCEoPs ruytHhcDgheCpxskSPoMjdyiqBZRO2YhBy/OLIvUBa9XWrcFT19yjSvY4eCy9pFoJ/L9BF+hk 9vVTuFtI/3+9UK10RyCSilAO/MwOEiwDJxz9tXKH458/UAUYkpuchF06CR06JEICFNngERks4 tnejjtlY0Vbr2YGSjA3MDvsf7/RnXZ0g/A3lAO4Tolas7NDtlrQ76WGW1f94QYsolueo= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ipv6 gre implementation was cleaned up to share more code with the ipv4 version, but it can be enabled even when NET_IPGRE_DEMUX is disabled, resulting in a link error: net/built-in.o: In function `gre_rcv': :(.text+0x17f5d0): undefined reference to `gre_parse_header' ERROR: "gre_parse_header" [net/ipv6/ip6_gre.ko] undefined! This adds a Kconfig dependency to prevent that now invalid configuration. Signed-off-by: Arnd Bergmann Fixes: 308edfdf1563 ("gre6: Cleanup GREv6 receive path, call common GRE functions") --- net/ipv6/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.7.0 diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 11e875ffd7ac..3f8411328de5 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig @@ -218,6 +218,7 @@ config IPV6_GRE tristate "IPv6: GRE tunnel" select IPV6_TUNNEL select NET_IP_TUNNEL + depends on NET_IPGRE_DEMUX ---help--- Tunneling means encapsulating data of one protocol type within another protocol and sending it over a channel that understands the