diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-29 07:37:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-29 07:37:56 +0200 |
| commit | 68c1f3a96c32a4fe15ebadae45c8145a5e5a66d2 (patch) | |
| tree | eaad407fb9f2c6381f3457585d394d587eeeb301 /net | |
| parent | net-2.6: SYN retransmits: Add new parameter to retransmits_timed_out() (diff) | |
| download | linux-68c1f3a96c32a4fe15ebadae45c8145a5e5a66d2.tar.xz linux-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')
| -rw-r--r-- | net/ipv4/Kconfig | 1 |
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 |