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

Next file: linux/net/ipv4/Makefile
Previous file: linux/net/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.38/linux/net/ipv4/Config.in linux/net/ipv4/Config.in
@@ -7,13 +7,15 @@
   bool 'IP: firewalling' CONFIG_IP_FIREWALL
 fi
 bool 'IP: accounting' CONFIG_IP_ACCT
-tristate 'IP: tunneling' CONFIG_NET_IPIP
-if [ "$CONFIG_IP_FORWARD" = "y" -a "$CONFIG_IP_FIREWALL" = "y" ]; then
-  bool 'IP: firewall packet logging' CONFIG_IP_FIREWALL_VERBOSE
-  bool 'IP: masquerading (ALPHA)' CONFIG_IP_MASQUERADE
-fi
-if [ "$CONFIG_IP_FORWARD" = "y" -a "$CONFIG_IP_MULTICAST" = "y" ]; then
-  bool 'IP: multicast routing(in progress)' CONFIG_IP_MROUTE
+if [ "$CONFIG_IP_FORWARD" = "y" ]; then
+  tristate 'IP: tunneling' CONFIG_NET_IPIP
+  if [ "$CONFIG_IP_FIREWALL" = "y" ]; then
+    bool 'IP: firewall packet logging' CONFIG_IP_FIREWALL_VERBOSE
+    bool 'IP: masquerading (ALPHA)' CONFIG_IP_MASQUERADE
+  fi
+  if [ "$CONFIG_IP_MULTICAST" = "y" ]; then
+    bool 'IP: multicast routing(in progress)' CONFIG_IP_MROUTE
+  fi
 fi
 comment '(it is safe to leave these untouched)'
 bool 'IP: PC/TCP compatibility mode' CONFIG_INET_PCTCP

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this