patch-2.3.34 linux/net/ipv4/Config.in

Next file: linux/net/ipv4/af_inet.c
Previous file: linux/net/core/netfilter.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.33/linux/net/ipv4/Config.in linux/net/ipv4/Config.in
@@ -8,22 +8,20 @@
    define_bool CONFIG_NETLINK y
    bool '    IP: policy routing' CONFIG_IP_MULTIPLE_TABLES
    if [ "$CONFIG_IP_MULTIPLE_TABLES" = "y" ]; then
-      bool '  IP: use FWMARK value as routing key' CONFIG_IP_ROUTE_FWMARK
+      bool '      IP: use FWMARK value as routing key' CONFIG_IP_ROUTE_FWMARK
+      bool '      IP: fast network address translation' CONFIG_IP_ROUTE_NAT
    fi
    bool '    IP: equal cost multipath' CONFIG_IP_ROUTE_MULTIPATH
    bool '    IP: use TOS value as routing key' CONFIG_IP_ROUTE_TOS
    bool '    IP: verbose route monitoring' CONFIG_IP_ROUTE_VERBOSE
    bool '    IP: large routing tables' CONFIG_IP_ROUTE_LARGE_TABLES
-   if [ "$CONFIG_IP_MULTIPLE_TABLES" = "y" ]; then
-      bool '      IP: fast network address translation' CONFIG_IP_ROUTE_NAT
-   fi
 fi
 bool '  IP: kernel level autoconfiguration' CONFIG_IP_PNP
 if [ "$CONFIG_IP_PNP" = "y" ]; then
-   bool '    BOOTP support' CONFIG_IP_PNP_BOOTP
-   bool '    RARP support' CONFIG_IP_PNP_RARP
+   bool '    IP: BOOTP support' CONFIG_IP_PNP_BOOTP
+   bool '    IP: RARP support' CONFIG_IP_PNP_RARP
 # not yet ready..
-#   bool '    ARP support' CONFIG_IP_PNP_ARP		
+#   bool '    IP: ARP support' CONFIG_IP_PNP_ARP		
 fi
 bool '  IP: optimize as router not host' CONFIG_IP_ROUTER
 tristate '  IP: tunneling' CONFIG_NET_IPIP

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)