commit d8238afa7eedc047b57da7ec98e98fb051fc4e85 Author: Chris Leech <[email protected]> Date: Fri Nov 17 11:37:29 2006 -0800 I/OAT: Add documentation for the tcp_dma_copybreak sysctl Signed-off-by: Chris Leech <[email protected]> looks fishy, like a cvs update went bad: diff -puN Documentation/networking/ip-sysctl.txt~git-ioat Documentation/networking/ip-sysctl.txt --- a/Documentation/networking/ip-sysctl.txt~git-ioat +++ a/Documentation/networking/ip-sysctl.txt @@ -387,6 +387,22 @@ tcp_workaround_signed_windows - BOOLEAN not receive a window scaling option from them. Default: 0 +<<<<<<< HEAD/Documentation/networking/ip-sysctl.txt +======= +tcp_slow_start_after_idle - BOOLEAN + If set, provide RFC2861 behavior and time out the congestion
Attachment:
pgpyEqzCVLmsw.pgp
Description: PGP signature
- Follow-Ups:
- Re: 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch?
- From: Andrew Morton <[email protected]>
- Re: 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch?
- Prev by Date: Re: kernel cmdline: root=/dev/sdb1,/dev/sda1 "fallback"?
- Next by Date: Re: BUG: linux 2.6.19 unable to enable acpi
- Previous by thread: [PATCH] nfs: Fix mismatch between encode_dent_fn and filldir_t
- Next by thread: Re: 2.6.20-rc4-mm1 - cvs merge whoops in git-ioat.patch?
- Index(es):
 |