diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /net/Config.in | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'net/Config.in')
| -rw-r--r-- | net/Config.in | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/net/Config.in b/net/Config.in index 53cd5b0c6..c00b0f902 100644 --- a/net/Config.in +++ b/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 (replaces ipchains)' 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 @@ -23,6 +29,24 @@ if [ "$CONFIG_INET" = "y" ]; then source net/ipv6/Config.in fi fi + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + 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 + 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 ' ' @@ -51,7 +75,6 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then 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' |