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

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 6bc03c911a83..4be34ef8c2f7 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -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
 };