diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 21:20:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 21:20:32 -0400 |
| commit | 12145387a042e8aa4439485f8976e6992a529b12 (patch) | |
| tree | ae161089e3058663510033fa85ed05115ab3b550 /Documentation | |
| parent | 6f4c5bdef2943d9ec074be32c437ca897016aaad (diff) | |
| parent | 68c9f75a0539db583db074059d54deb607d1a475 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[BNX2]: Fix occasional NETDEV WATCHDOG on 5709.
[IPV6]: Disallow RH0 by default.
[XFRM]: beet: fix pseudo header length value
[TCP]: Congestion control initialization.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index d3aae1f9b4c1..702d1d8dd04a 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt | |||
| @@ -851,6 +851,15 @@ accept_redirects - BOOLEAN | |||
| 851 | Functional default: enabled if local forwarding is disabled. | 851 | Functional default: enabled if local forwarding is disabled. |
| 852 | disabled if local forwarding is enabled. | 852 | disabled if local forwarding is enabled. |
| 853 | 853 | ||
| 854 | accept_source_route - INTEGER | ||
| 855 | Accept source routing (routing extension header). | ||
| 856 | |||
| 857 | > 0: Accept routing header. | ||
| 858 | = 0: Accept only routing header type 2. | ||
| 859 | < 0: Do not accept routing header. | ||
| 860 | |||
| 861 | Default: 0 | ||
| 862 | |||
| 854 | autoconf - BOOLEAN | 863 | autoconf - BOOLEAN |
| 855 | Autoconfigure addresses using Prefix Information in Router | 864 | Autoconfigure addresses using Prefix Information in Router |
| 856 | Advertisements. | 865 | Advertisements. |