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

Next file: linux/net/ipv4/Makefile
Previous file: linux/net/ethernet/eth.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.14/linux/net/ipv4/Config.in linux/net/ipv4/Config.in
@@ -10,12 +10,14 @@
 	bool 'IP: firewall packet netlink device' CONFIG_IP_FIREWALL_NETLINK
     fi
     bool 'IP: firewall packet logging' CONFIG_IP_FIREWALL_VERBOSE
-    if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_IP_FORWARD" = "y" ]; then
-      bool 'IP: masquerading (EXPERIMENTAL)' CONFIG_IP_MASQUERADE
+    if [ "$CONFIG_IP_FORWARD" = "y" ]; then
+      bool 'IP: masquerading' CONFIG_IP_MASQUERADE
       if [ "$CONFIG_IP_MASQUERADE" != "n" ]; then
         comment 'Protocol-specific masquerading support will be built as modules.'
       fi
-      bool 'IP: transparent proxy support (EXPERIMENTAL)' CONFIG_IP_TRANSPARENT_PROXY
+# hmm... but transparent proxy is useful without forwarding too..
+# i.e. non-lan users will get anonftpd instead of wu-ftpd...
+      bool 'IP: transparent proxy support' CONFIG_IP_TRANSPARENT_PROXY
       bool 'IP: always defragment' CONFIG_IP_ALWAYS_DEFRAG
     fi
   fi
@@ -25,9 +27,7 @@
   bool 'IP: optimize as router not host' CONFIG_IP_ROUTER
   tristate 'IP: tunneling' CONFIG_NET_IPIP
   if [ "$CONFIG_IP_MULTICAST" = "y" ]; then
-      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-        bool 'IP: multicast routing (EXPERIMENTAL)' CONFIG_IP_MROUTE
-      fi		
+    bool 'IP: multicast routing' CONFIG_IP_MROUTE
   fi
 fi
 if [ "$CONFIG_NET_ALIAS" = "y" ]; then
@@ -41,7 +41,7 @@
 comment '(it is safe to leave these untouched)'
 bool 'IP: PC/TCP compatibility mode' CONFIG_INET_PCTCP
 tristate 'IP: Reverse ARP' CONFIG_INET_RARP
-bool 'IP: Disable Path MTU Discovery (normally enabled)' CONFIG_NO_PATH_MTU_DISCOVERY
+bool 'IP: Path MTU Discovery (normally enabled)' CONFIG_PATH_MTU_DISCOVERY
 #bool 'IP: Disable NAGLE algorithm (normally enabled)' CONFIG_TCP_NAGLE_OFF
 bool 'IP: Drop source routed frames' CONFIG_IP_NOSR
 bool 'IP: Allow large windows (not recommended if <16Mb of memory)' CONFIG_SKB_LARGE

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov