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

2005-12-11 20:23:58 -08:00
parent fe3f2053fd 73d4f84fd0
commit 913f2d792f
19 changed files with 305 additions and 225 deletions
@@ -670,6 +670,9 @@ enum {
 	NET_DECNET_DST_GC_INTERVAL = 9,
 	NET_DECNET_CONF = 10,
 	NET_DECNET_NO_FC_MAX_CWND = 11,
+	NET_DECNET_MEM = 12,
+	NET_DECNET_RMEM = 13,
+	NET_DECNET_WMEM = 14,
 	NET_DECNET_DEBUG_LEVEL = 255
 };