aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-02 22:00:34 -0800
committerDavid S. Miller <davem@davemloft.net>2009-12-02 22:00:34 -0800
commite00484023ebe94dce03fdd1270edf3e191c2bc79 (patch)
tree6089a0237822b46ec908be7e7cb3bea2dd426b73 /Documentation
parentcnic: Use dma_alloc_coherent(). (diff)
parentip: update the description of rp_filter in ip-sysctl.txt (diff)
downloadlinux-dev-e00484023ebe94dce03fdd1270edf3e191c2bc79.tar.xz
linux-dev-e00484023ebe94dce03fdd1270edf3e191c2bc79.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/networking/ip-sysctl.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index a0e134dd2523..554440af675c 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -738,8 +738,8 @@ rp_filter - INTEGER
to prevent IP spoofing from DDos attacks. If using asymmetric routing
or other complicated routing, then loose mode is recommended.
- conf/all/rp_filter must also be set to non-zero to do source validation
- on the interface
+ The max value from conf/{all,interface}/rp_filter is used
+ when doing source validation on the {interface}.
Default value is 0. Note that some distributions enable it
in startup scripts.