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

2005-11-11 17:00:17 -08:00
parent 9cf93d7b2f 049b3ff5a8
commit 508862e493
13 changed files with 109 additions and 76 deletions
--- 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 */