patch-2.3.15 linux/net/Config.in

Next file: linux/net/Makefile
Previous file: linux/net/802/tr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.14/linux/net/Config.in linux/net/Config.in
@@ -4,12 +4,18 @@
 mainmenu_option next_comment
 comment 'Networking options'
 tristate 'Packet socket' CONFIG_PACKET
+if [ "$CONFIG_PACKET" != "n" ]; then
+  bool 'Packet socket: mmapped IO' CONFIG_PACKET_MMAP
+fi
 bool 'Kernel/User netlink socket' CONFIG_NETLINK
 if [ "$CONFIG_NETLINK" = "y" ]; then
   bool 'Routing messages' CONFIG_RTNETLINK
   tristate 'Netlink device emulation' CONFIG_NETLINK_DEV
 fi
-bool 'Network firewalls' CONFIG_FIREWALL
+bool 'Network packet filtering' CONFIG_NETFILTER
+if [ "$CONFIG_NETFILTER" = "y" ]; then
+  bool 'Network packet filtering debugging' CONFIG_NETFILTER_DEBUG
+fi
 bool 'Socket Filtering'  CONFIG_FILTER
 tristate 'Unix domain sockets' CONFIG_UNIX
 bool 'TCP/IP networking' CONFIG_INET
@@ -27,6 +33,22 @@
 	source net/khttpd/Config.in
   fi
 fi
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+  bool 'Asynchronous Transfer Mode (ATM, EXPERIMENTAL)' CONFIG_ATM y
+  if [ "$CONFIG_ATM" = "y" ]; then
+    if [ "$CONFIG_INET" = "y" ]; then
+      bool '  Classical IP over ATM' CONFIG_ATM_CLIP y
+      if [ "$CONFIG_ATM_CLIP" = "y" ]; then
+	bool '    Do NOT send ICMP if no neighbour' CONFIG_ATM_CLIP_NO_ICMP n
+      fi
+#      bool '  Application REQUested IP over ATM' CONFIG_AREQUIPA y
+    fi
+    tristate '  LAN Emulation (LANE) support' CONFIG_ATM_LANE y
+    if [ "$CONFIG_INET" = "y" -a "$CONFIG_ATM_LANE" != "n" ]; then
+      tristate '  Multi-Protocol Over ATM (MPOA) support' CONFIG_ATM_MPOA y
+    fi
+  fi
+fi
 
 comment ' '
 tristate 'The IPX protocol' CONFIG_IPX
@@ -54,7 +76,6 @@
   tristate 'WAN router' CONFIG_WAN_ROUTER
   bool 'Fast switching (read help!)' CONFIG_NET_FASTROUTE
   bool 'Forwarding between high speed interfaces' CONFIG_NET_HW_FLOWCONTROL
-  bool 'CPU is too slow to handle full bandwidth' CONFIG_CPU_IS_SLOW
   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
   mainmenu_option next_comment
   comment 'QoS and/or fair queueing'

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)