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

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

diff -u --recursive --new-file v2.1.24/linux/net/ipv4/Config.in linux/net/ipv4/Config.in
@@ -1,7 +1,6 @@
 #
 # IP configuration
 #
-bool 'IP: forwarding/gatewaying' CONFIG_IP_FORWARD
 bool 'IP: multicasting' CONFIG_IP_MULTICAST
 if [ "$CONFIG_FIREWALL" = "y" ]; then
   bool 'IP: firewalling' CONFIG_IP_FIREWALL
@@ -10,16 +9,12 @@
 	bool 'IP: firewall packet netlink device' CONFIG_IP_FIREWALL_NETLINK
     fi
     bool 'IP: firewall packet logging' CONFIG_IP_FIREWALL_VERBOSE
-    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
-# 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
+    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' CONFIG_IP_TRANSPARENT_PROXY
+    bool 'IP: always defragment' CONFIG_IP_ALWAYS_DEFRAG
   fi
 fi
 bool 'IP: accounting' CONFIG_IP_ACCT

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