diff options
| author | Shan Wei <davidshan@tencent.com> | 2012-04-26 16:52:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-27 00:09:26 -0400 |
| commit | c60f6aa8acfd93f4550c7d5eb03351d4cbd1460d (patch) | |
| tree | bc4096eff08201aff7481f6b08889acfb23294ba /Documentation | |
| parent | 06b0ab373df74f7916282b452b35d6389a605b8a (diff) | |
| download | talos-op-linux-c60f6aa8acfd93f4550c7d5eb03351d4cbd1460d.tar.gz talos-op-linux-c60f6aa8acfd93f4550c7d5eb03351d4cbd1460d.zip | |
net: doc: merge /proc/sys/net/core/* documents into one place
All parameter descriptions in /proc/sys/net/core/* now is separated
two places. So, merge them into Documentation/sysctl/net.txt.
Signed-off-by: Shan Wei <davidshan@tencent.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 5 | ||||
| -rw-r--r-- | Documentation/sysctl/net.txt | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index bd80ba5847d2..9b569a2d9c60 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -1484,11 +1484,8 @@ addr_scope_policy - INTEGER /proc/sys/net/core/* -dev_weight - INTEGER - The maximum number of packets that kernel can handle on a NAPI - interrupt, it's a Per-CPU variable. + Please see: Documentation/sysctl/net.txt for descriptions of these entries. - Default: 64 /proc/sys/net/unix/* max_dgram_qlen - INTEGER diff --git a/Documentation/sysctl/net.txt b/Documentation/sysctl/net.txt index 3201a7097e4d..98335b7a5337 100644 --- a/Documentation/sysctl/net.txt +++ b/Documentation/sysctl/net.txt @@ -43,6 +43,13 @@ Values : 1 - enable the JIT 2 - enable the JIT and ask the compiler to emit traces on kernel log. +dev_weight +-------------- + +The maximum number of packets that kernel can handle on a NAPI interrupt, +it's a Per-CPU variable. +Default: 64 + rmem_default ------------ |
