aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorShan Wei <davidshan@tencent.com>2012-04-26 12:52:52 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-27 00:09:26 -0400
commitc60f6aa8acfd93f4550c7d5eb03351d4cbd1460d (patch)
treebc4096eff08201aff7481f6b08889acfb23294ba /Documentation
parent06b0ab373df74f7916282b452b35d6389a605b8a (diff)
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.txt5
-rw-r--r--Documentation/sysctl/net.txt7
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
1484 1484
1485 1485
1486/proc/sys/net/core/* 1486/proc/sys/net/core/*
1487dev_weight - INTEGER 1487 Please see: Documentation/sysctl/net.txt for descriptions of these entries.
1488 The maximum number of packets that kernel can handle on a NAPI
1489 interrupt, it's a Per-CPU variable.
1490 1488
1491 Default: 64
1492 1489
1493/proc/sys/net/unix/* 1490/proc/sys/net/unix/*
1494max_dgram_qlen - INTEGER 1491max_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 :
43 1 - enable the JIT 43 1 - enable the JIT
44 2 - enable the JIT and ask the compiler to emit traces on kernel log. 44 2 - enable the JIT and ask the compiler to emit traces on kernel log.
45 45
46dev_weight
47--------------
48
49The maximum number of packets that kernel can handle on a NAPI interrupt,
50it's a Per-CPU variable.
51Default: 64
52
46rmem_default 53rmem_default
47------------ 54------------
48 55