diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2004-01-19 05:05:07 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2004-01-19 05:05:07 -0800 |
| commit | bd23ad706ee39fc5e8a530380c4ccc2b1a4aba4c (patch) | |
| tree | 036fed42956901b46f094783050f807cdcfdd23d /include/linux | |
| parent | d8baa0e00589d7e03585a8ecad8100f0e8531d25 (diff) | |
| parent | 3ac3019bbcb2ee28490be1513e7db100199edc6e (diff) | |
Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work
into nuts.ninka.net:/disk1/davem/BK/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sctp.h | 3 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/sctp.h b/include/linux/sctp.h index a022f9f629f6..9ddc3bd5cd81 100644 --- a/include/linux/sctp.h +++ b/include/linux/sctp.h @@ -439,12 +439,13 @@ typedef enum { * 0x0101 Operation Refused Due to Resource Shortage. * 0x0102 Request to Delete Source IP Address. * 0x0103 Association Aborted due to illegal ASCONF-ACK + * 0x0104 Request refused - no authorization. */ SCTP_ERROR_DEL_LAST_IP = __constant_htons(0x0100), SCTP_ERROR_RSRC_LOW = __constant_htons(0x0101), SCTP_ERROR_DEL_SRC_IP = __constant_htons(0x0102), SCTP_ERROR_ASCONF_ACK = __constant_htons(0x0103), - + SCTP_ERROR_REQ_REFUSED = __constant_htons(0x0104) } sctp_error_t; diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index b8be51acff95..d271fcada7dd 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -580,6 +580,7 @@ enum { NET_SCTP_HB_INTERVAL = 10, NET_SCTP_PRESERVE_ENABLE = 11, NET_SCTP_MAX_BURST = 12, + NET_SCTP_ADDIP_ENABLE = 13, }; /* /proc/sys/net/bridge */ |