Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/scsi/fcoe/fcoe.c

1 files changed, 12 insertions, 3 deletions

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 7f98aa3962c6..3ffd233c369c 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -1275,13 +1275,22 @@ sctp_rmem - vector of 3 INTEGERs: min, default, max
 sctp_wmem  - vector of 3 INTEGERs: min, default, max
         See tcp_wmem for a description.
 
-UNDOCUMENTED:
 
 /proc/sys/net/core/*
-        dev_weight FIXME
+dev_weight - INTEGER
+        The maximum number of packets that kernel can handle on a NAPI
+        interrupt, it's a Per-CPU variable.
+
+        Default: 64
 
 /proc/sys/net/unix/*
-        max_dgram_qlen FIXME
+max_dgram_qlen - INTEGER
+        The maximum length of dgram socket receive queue
+
+        Default: 10
+
+
+UNDOCUMENTED:
 
 /proc/sys/net/irda/*
         fast_poll_increase FIXME