IPIP: Use ip-tunneling code.

[~andy/linux] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 7944df768454caf1cc87905de319a644a6dc3736..053b53e9e3c3ce8a3d88151e87645845ed138218 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -166,6 +166,7 @@ config IP_PNP_RARP
 config NET_IPIP
        tristate "IP: tunneling"
        select INET_TUNNEL
+       select NET_IP_TUNNEL
        ---help---
          Tunneling means encapsulating data of one protocol type within
          another protocol and sending it over a channel that understands the
@@ -186,9 +187,14 @@ config NET_IPGRE_DEMUX
         This is helper module to demultiplex GRE packets on GRE version field criteria.
         Required by ip_gre and pptp modules.
 
+config NET_IP_TUNNEL
+       tristate
+       default n
+
 config NET_IPGRE
        tristate "IP: GRE tunnels over IP"
        depends on (IPV6 || IPV6=n) && NET_IPGRE_DEMUX
+       select NET_IP_TUNNEL
        help
          Tunneling means encapsulating data of one protocol type within
          another protocol and sending it over a channel that understands the