diff options
| author | James Morris <jmorris@namei.org> | 2011-03-07 18:55:06 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-07 18:55:06 -0500 |
| commit | 1cc26bada9f6807814806db2f0d78792eecdac71 (patch) | |
| tree | 5509b5139db04af6c13db0a580c84116a4a54039 /include/net/sctp/user.h | |
| parent | eae61f3c829439f8f9121b5cd48a14be04df451f (diff) | |
| parent | 214d93b02c4fe93638ad268613c9702a81ed9192 (diff) | |
Merge branch 'master'; commit 'v2.6.38-rc7' into next
Diffstat (limited to 'include/net/sctp/user.h')
| -rw-r--r-- | include/net/sctp/user.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h index 2b2769c5ca9f..e73ebdae323d 100644 --- a/include/net/sctp/user.h +++ b/include/net/sctp/user.h | |||
| @@ -78,6 +78,7 @@ typedef __s32 sctp_assoc_t; | |||
| 78 | #define SCTP_GET_PEER_ADDR_INFO 15 | 78 | #define SCTP_GET_PEER_ADDR_INFO 15 |
| 79 | #define SCTP_DELAYED_ACK_TIME 16 | 79 | #define SCTP_DELAYED_ACK_TIME 16 |
| 80 | #define SCTP_DELAYED_ACK SCTP_DELAYED_ACK_TIME | 80 | #define SCTP_DELAYED_ACK SCTP_DELAYED_ACK_TIME |
| 81 | #define SCTP_DELAYED_SACK SCTP_DELAYED_ACK_TIME | ||
| 81 | #define SCTP_CONTEXT 17 | 82 | #define SCTP_CONTEXT 17 |
| 82 | #define SCTP_FRAGMENT_INTERLEAVE 18 | 83 | #define SCTP_FRAGMENT_INTERLEAVE 18 |
| 83 | #define SCTP_PARTIAL_DELIVERY_POINT 19 /* Set/Get partial delivery point */ | 84 | #define SCTP_PARTIAL_DELIVERY_POINT 19 /* Set/Get partial delivery point */ |
| @@ -99,8 +100,8 @@ typedef __s32 sctp_assoc_t; | |||
| 99 | #define SCTP_SOCKOPT_PEELOFF 102 /* peel off association. */ | 100 | #define SCTP_SOCKOPT_PEELOFF 102 /* peel off association. */ |
| 100 | /* Options 104-106 are deprecated and removed. Do not use this space */ | 101 | /* Options 104-106 are deprecated and removed. Do not use this space */ |
| 101 | #define SCTP_SOCKOPT_CONNECTX_OLD 107 /* CONNECTX old requests. */ | 102 | #define SCTP_SOCKOPT_CONNECTX_OLD 107 /* CONNECTX old requests. */ |
| 102 | #define SCTP_GET_PEER_ADDRS 108 /* Get all peer addresss. */ | 103 | #define SCTP_GET_PEER_ADDRS 108 /* Get all peer address. */ |
| 103 | #define SCTP_GET_LOCAL_ADDRS 109 /* Get all local addresss. */ | 104 | #define SCTP_GET_LOCAL_ADDRS 109 /* Get all local address. */ |
| 104 | #define SCTP_SOCKOPT_CONNECTX 110 /* CONNECTX requests. */ | 105 | #define SCTP_SOCKOPT_CONNECTX 110 /* CONNECTX requests. */ |
| 105 | #define SCTP_SOCKOPT_CONNECTX3 111 /* CONNECTX requests (updated) */ | 106 | #define SCTP_SOCKOPT_CONNECTX3 111 /* CONNECTX requests (updated) */ |
| 106 | 107 | ||