aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-09-28 22:37:56 -0700
committerDavid S. Miller <davem@davemloft.net>2010-09-28 22:37:56 -0700
commit68c1f3a96c32a4fe15ebadae45c8145a5e5a66d2 (patch)
treeeaad407fb9f2c6381f3457585d394d587eeeb301 /net/ipv4/Kconfig
parentnet-2.6: SYN retransmits: Add new parameter to retransmits_timed_out() (diff)
downloadlinux-dev-68c1f3a96c32a4fe15ebadae45c8145a5e5a66d2.tar.xz
linux-dev-68c1f3a96c32a4fe15ebadae45c8145a5e5a66d2.zip
ip_gre: Fix dependencies wrt. ipv6.
The GRE tunnel driver needs to invoke icmpv6 helpers in the ipv6 stack when ipv6 support is enabled. Therefore if IPV6 is enabled, we have to enforce that GRE's enabling (modular or static) matches that of ipv6. Reported-by: Patrick McHardy <kaber@trash.net> Reported-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/Kconfig')
-rw-r--r--net/ipv4/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 571f8950ed06..72380a30d1c8 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -217,6 +217,7 @@ config NET_IPIP
config NET_IPGRE
tristate "IP: GRE tunnels over IP"
+ depends on IPV6 || IPV6=n
help
Tunneling means encapsulating data of one protocol type within
another protocol and sending it over a channel that understands the