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

Next file: linux/net/ipv4/tcp_ipv4.c
Previous file: linux/mm/vmscan.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.130/linux/net/ipv4/Config.in linux/net/ipv4/Config.in
@@ -31,21 +31,23 @@
 	    define_bool CONFIG_NETLINK_DEV y
 	fi
     fi
-    bool 'IP: transparent proxy support' CONFIG_IP_TRANSPARENT_PROXY
-    bool 'IP: always defragment' CONFIG_IP_ALWAYS_DEFRAG
+    bool 'IP: always defragment (required for masquerading)' CONFIG_IP_ALWAYS_DEFRAG
   fi
 fi
 if [ "$CONFIG_IP_FIREWALL" = "y" ]; then
-  bool 'IP: masquerading' CONFIG_IP_MASQUERADE
-  if [ "$CONFIG_IP_MASQUERADE" != "n" ]; then
-    comment 'Protocol-specific masquerading support will be built as modules.'
-    bool 'IP: ICMP masquerading' CONFIG_IP_MASQUERADE_ICMP
-    comment 'Protocol-specific masquerading support will be built as modules.'
-    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-      bool 'IP: masquerading special modules support' CONFIG_IP_MASQUERADE_MOD 
-      if [ "$CONFIG_IP_MASQUERADE_MOD" = "y" ]; then
-        tristate 'IP: ipautofw masq support (EXPERIMENTAL)' CONFIG_IP_MASQUERADE_IPAUTOFW
-        tristate 'IP: ipportfw masq support (EXPERIMENTAL)' CONFIG_IP_MASQUERADE_IPPORTFW
+  if [ "$CONFIG_IP_ALWAYS_DEFRAG" != "n" ]; then
+    bool 'IP: transparent proxy support' CONFIG_IP_TRANSPARENT_PROXY
+    bool 'IP: masquerading' CONFIG_IP_MASQUERADE
+    if [ "$CONFIG_IP_MASQUERADE" != "n" ]; then
+      comment 'Protocol-specific masquerading support will be built as modules.'
+      bool 'IP: ICMP masquerading' CONFIG_IP_MASQUERADE_ICMP
+      comment 'Protocol-specific masquerading support will be built as modules.'
+      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+        bool 'IP: masquerading special modules support' CONFIG_IP_MASQUERADE_MOD 
+        if [ "$CONFIG_IP_MASQUERADE_MOD" = "y" ]; then
+          tristate 'IP: ipautofw masq support (EXPERIMENTAL)' CONFIG_IP_MASQUERADE_IPAUTOFW
+          tristate 'IP: ipportfw masq support (EXPERIMENTAL)' CONFIG_IP_MASQUERADE_IPPORTFW
+	fi
       fi
     fi
   fi

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