patch-2.3.99-pre2 linux/net/ipv4/Config.in

• Lines: 16
• Date: Fri Mar 17 10:56:20 2000
• Orig file: v2.3.99-pre1/linux/net/ipv4/Config.in
• Orig date: Thu Jan 6 12:57:48 2000

diff -u --recursive --new-file v2.3.99-pre1/linux/net/ipv4/Config.in linux/net/ipv4/Config.in
@@ -9,7 +9,7 @@
    bool '    IP: policy routing' CONFIG_IP_MULTIPLE_TABLES
    if [ "$CONFIG_IP_MULTIPLE_TABLES" = "y" ]; then
       if [ "$CONFIG_NETFILTER" = "y" ]; then
-         bool '      IP: use FWMARK value as routing key' CONFIG_IP_ROUTE_FWMARK
+         bool '      IP: use netfilter MARK value as routing key' CONFIG_IP_ROUTE_FWMARK
       fi
       bool '      IP: fast network address translation' CONFIG_IP_ROUTE_NAT
    fi
@@ -53,3 +53,6 @@
 #if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then 
 #   bool '  IP: support checksum copy to user for UDP (EXPERIMENTAL)'  CONFIG_UDP_DELAY_CSUM
 #fi
+if [ "$CONFIG_NETFILTER" != "n" ]; then
+   source net/ipv4/netfilter/Config.in
+fi