* [PATCH net-next] net: doc: merge /proc/sys/net/core/* documents into one place
@ 2012-04-27 2:52 Shan Wei
2012-04-27 4:07 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Shan Wei @ 2012-04-27 2:52 UTC (permalink / raw)
To: David Miller; +Cc: NetDev
From: Shan Wei <davidshan@tencent.com>
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>
---
Documentation/networking/ip-sysctl.txt | 5 +----
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 bd80ba5..9b569a2 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 3201a70..98335b7 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
------------
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: doc: merge /proc/sys/net/core/* documents into one place
2012-04-27 2:52 [PATCH net-next] net: doc: merge /proc/sys/net/core/* documents into one place Shan Wei
@ 2012-04-27 4:07 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-04-27 4:07 UTC (permalink / raw)
To: shanwei88; +Cc: netdev
From: Shan Wei <shanwei88@gmail.com>
Date: Fri, 27 Apr 2012 10:52:52 +0800
> From: Shan Wei <davidshan@tencent.com>
>
> 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>
I'll apply this, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-27 4:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-27 2:52 [PATCH net-next] net: doc: merge /proc/sys/net/core/* documents into one place Shan Wei
2012-04-27 4:07 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).