summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds2005-11-12 02:00:17 +0100
committerLinus Torvalds2005-11-12 02:00:17 +0100
commit508862e493f1107d17fa5a0015084b1773ffc41e (patch)
treea7c619335bb2f852b1b7c3b8760552eb6f4890bc /include/linux
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[SCTP]: Include ulpevents in socket receive buffer accounting. (diff)
downloadkernel-qcow2-linux-508862e493f1107d17fa5a0015084b1773ffc41e.tar.gz
kernel-qcow2-linux-508862e493f1107d17fa5a0015084b1773ffc41e.tar.xz
kernel-qcow2-linux-508862e493f1107d17fa5a0015084b1773ffc41e.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sysctl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index ab2791b3189d..64f203c45378 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -715,6 +715,7 @@ enum {
NET_SCTP_PRSCTP_ENABLE = 14,
NET_SCTP_SNDBUF_POLICY = 15,
NET_SCTP_SACK_TIMEOUT = 16,
+ NET_SCTP_RCVBUF_POLICY = 17,
};
/* /proc/sys/net/bridge */