summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-11 20:23:58 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-11 20:23:58 -0800
commit913f2d792ff584bf9ebf5968472b3e4ffe0fd9c8 (patch)
tree37c499384a1e516a9b92ddb841fada84e9be0167 /include/linux
parentfe3f2053fd42148b3ebb7b90de5f20eaf3393860 (diff)
parent73d4f84fd001b0be67fea46e84b75e6a7a5da08e (diff)
downloadop-kernel-dev-913f2d792ff584bf9ebf5968472b3e4ffe0fd9c8.zip
op-kernel-dev-913f2d792ff584bf9ebf5968472b3e4ffe0fd9c8.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sysctl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 6bc03c9..4be34ef 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
};
OpenPOWER on IntegriCloud