vserver 1.9.3

[linux-2.6.git] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index de00c66..ab116cb 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -60,12 +60,8 @@ config IP_MULTIPLE_TABLES
          Normally, a router decides what to do with a received packet based
          solely on the packet's final destination address. If you say Y here,
          the Linux router will also be able to take the packet's source
-         address into account. Furthermore, if you also say Y to "Use TOS
-         value as routing key" below, the TOS (Type-Of-Service) field of the
-         packet can be used for routing decisions as well. In addition, if
-         you say Y here and to "Fast network address translation" below,
-         the router will also be able to modify source and destination
-         addresses of forwarded packets.
+         address into account. Furthermore, the TOS (Type-Of-Service) field
+         of the packet can be used for routing decisions as well.
 
          If you are interested in this, please see the preliminary
          documentation at <http://www.compendium.com.ar/policy-routing.txt>
@@ -82,16 +78,6 @@ config IP_ROUTE_FWMARK
          If you say Y here, you will be able to specify different routes for
          packets with different mark values (see iptables(8), MARK target).
 
-config IP_ROUTE_NAT
-       bool "IP: fast network address translation"
-       depends on IP_MULTIPLE_TABLES
-       help
-         If you say Y here, your router will be able to modify source and
-         destination addresses of packets that pass through it, in a manner
-         you specify.  General information about Network Address Translation
-         can be gotten from the document
-         <http://www.hasenstein.com/linux-ip-nat/diplom/nat.html>.
-
 config IP_ROUTE_MULTIPATH
        bool "IP: equal cost multipath"
        depends on IP_ADVANCED_ROUTER
@@ -104,16 +90,6 @@ config IP_ROUTE_MULTIPATH
          equal "cost" and chooses one of them in a non-deterministic fashion
          if a matching packet arrives.
 
-config IP_ROUTE_TOS
-       bool "IP: use TOS value as routing key"
-       depends on IP_ADVANCED_ROUTER
-       help
-         The header of every IP packet carries a TOS (Type Of Service) value
-         with which the packet requests a certain treatment, e.g. low
-         latency (for interactive traffic), high throughput, or high
-         reliability.  If you say Y here, you will be able to specify
-         different routes for packets with different TOS values.
-
 config IP_ROUTE_VERBOSE
        bool "IP: verbose route monitoring"
        depends on IP_ADVANCED_ROUTER
@@ -187,7 +163,7 @@ config IP_PNP_RARP
 config NET_IPIP
        tristate "IP: tunneling"
        depends on INET
-       select XFRM
+       select INET_TUNNEL
        ---help---
          Tunneling means encapsulating data of one protocol type within
          another protocol and sending it over a channel that understands the
@@ -351,6 +327,7 @@ config INET_ESP
 config INET_IPCOMP
        tristate "IP: IPComp transformation"
        select XFRM
+       select INET_TUNNEL
        select CRYPTO
        select CRYPTO_DEFLATE
        ---help---
@@ -359,5 +336,14 @@ config INET_IPCOMP
          
          If unsure, say Y.
 
+config INET_TUNNEL
+       tristate "IP: tunnel transformation"
+       select XFRM
+       ---help---
+         Support for generic IP tunnel transformation, which is required by
+         the IP tunneling module as well as tunnel mode IPComp.
+         
+         If unsure, say Y.
+
 source "net/ipv4/ipvs/Kconfig"