From: Arnd Bergmann Date: Tue, 3 May 2016 15:19:57 +0000 (+0200) Subject: gre6: add Kconfig dependency for NET_IPGRE_DEMUX X-Git-Tag: v4.9.8~2112^2~121 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8bf42e9e51cce73874252e5b8fb938bb09bf0ce4;p=platform%2Fkernel%2Flinux-rpi3.git gre6: add Kconfig dependency for NET_IPGRE_DEMUX 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") Acked-by: Tom Herbert Signed-off-by: David S. Miller --- diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 11e875f..3f84113 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