diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
| commit | c7c4310f7fc1485925d800628bf50b3aeab535ef (patch) | |
| tree | b12aa4be0e8fb82aaaea97fb475e793e8a347c49 /net/ipv4/Config.in | |
| parent | 1ffd1d069ca4c5ffe16fea6175dab1b9bbb15820 (diff) | |
Merge with Linux 2.4.0-test3-pre8. Linus has accepted most of what
I've sent him, so we're very close to full integration of the MIPS
port into his sources.
Diffstat (limited to 'net/ipv4/Config.in')
| -rw-r--r-- | net/ipv4/Config.in | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/ipv4/Config.in b/net/ipv4/Config.in index 68fea0272..7a44fa565 100644 --- a/net/ipv4/Config.in +++ b/net/ipv4/Config.in @@ -44,15 +44,8 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then bool ' IP: ARP daemon support (EXPERIMENTAL)' CONFIG_ARPD fi fi +bool ' IP: TCP Explicit Congestion Notification support' CONFIG_INET_ECN bool ' IP: TCP syncookie support (disabled per default)' CONFIG_SYN_COOKIES -comment '(it is safe to leave these untouched)' -#bool ' IP: PC/TCP compatibility mode' CONFIG_INET_PCTCP -#bool ' IP: Path MTU Discovery (normally enabled)' CONFIG_PATH_MTU_DISCOVERY -#bool ' IP: Disable NAGLE algorithm (normally enabled)' CONFIG_TCP_NAGLE_OFF -bool ' IP: Allow large windows (not recommended if <16Mb of memory)' CONFIG_SKB_LARGE -#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 |