* [PATCH] gre6: add Kconfig dependency for NET_IPGRE_DEMUX
@ 2016-05-03 15:19 Arnd Bergmann
2016-05-03 15:24 ` Tom Herbert
2016-05-04 18:12 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2016-05-03 15:19 UTC (permalink / raw)
To: David S. Miller
Cc: Arnd Bergmann, Alexey Kuznetsov, James Morris, Hideaki YOSHIFUJI,
Patrick McHardy, Tom Herbert, Thomas Egerer, Paolo Abeni, netdev,
linux-kernel
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 <arnd@arndb.de>
Fixes: 308edfdf1563 ("gre6: Cleanup GREv6 receive path, call common GRE functions")
---
net/ipv6/Kconfig | 1 +
1 file changed, 1 insertion(+)
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
--
2.7.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gre6: add Kconfig dependency for NET_IPGRE_DEMUX
2016-05-03 15:19 [PATCH] gre6: add Kconfig dependency for NET_IPGRE_DEMUX Arnd Bergmann
@ 2016-05-03 15:24 ` Tom Herbert
2016-05-04 18:12 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Tom Herbert @ 2016-05-03 15:24 UTC (permalink / raw)
To: Arnd Bergmann
Cc: David S. Miller, Alexey Kuznetsov, James Morris,
Hideaki YOSHIFUJI, Patrick McHardy, Thomas Egerer, Paolo Abeni,
Linux Kernel Network Developers, LKML
On Tue, May 3, 2016 at 8:19 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> 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 <arnd@arndb.de>
> Fixes: 308edfdf1563 ("gre6: Cleanup GREv6 receive path, call common GRE functions")
> ---
Acked-by: Tom Herbert <tom@herbertland.com>
> net/ipv6/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> 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
> --
> 2.7.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gre6: add Kconfig dependency for NET_IPGRE_DEMUX
2016-05-03 15:19 [PATCH] gre6: add Kconfig dependency for NET_IPGRE_DEMUX Arnd Bergmann
2016-05-03 15:24 ` Tom Herbert
@ 2016-05-04 18:12 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-05-04 18:12 UTC (permalink / raw)
To: arnd
Cc: kuznet, jmorris, yoshfuji, kaber, tom, hakke_007, pabeni, netdev,
linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 3 May 2016 17:19:57 +0200
> 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 <arnd@arndb.de>
> Fixes: 308edfdf1563 ("gre6: Cleanup GREv6 receive path, call common GRE functions")
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-04 18:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-03 15:19 [PATCH] gre6: add Kconfig dependency for NET_IPGRE_DEMUX Arnd Bergmann
2016-05-03 15:24 ` Tom Herbert
2016-05-04 18:12 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).