diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 20:00:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 20:00:17 -0500 |
| commit | 508862e493f1107d17fa5a0015084b1773ffc41e (patch) | |
| tree | a7c619335bb2f852b1b7c3b8760552eb6f4890bc /include/linux | |
| parent | 9cf93d7b2f4516271ccf5b48f958bd474cf9dd67 (diff) | |
| parent | 049b3ff5a86d0187184a189d2e31b8654d58fe22 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sysctl.h | 1 |
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 { | |||
| 715 | NET_SCTP_PRSCTP_ENABLE = 14, | 715 | NET_SCTP_PRSCTP_ENABLE = 14, |
| 716 | NET_SCTP_SNDBUF_POLICY = 15, | 716 | NET_SCTP_SNDBUF_POLICY = 15, |
| 717 | NET_SCTP_SACK_TIMEOUT = 16, | 717 | NET_SCTP_SACK_TIMEOUT = 16, |
| 718 | NET_SCTP_RCVBUF_POLICY = 17, | ||
| 718 | }; | 719 | }; |
| 719 | 720 | ||
| 720 | /* /proc/sys/net/bridge */ | 721 | /* /proc/sys/net/bridge */ |