diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /include/net | |
| parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
| parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sctp/user.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h index 92eedc091517..e73ebdae323d 100644 --- a/include/net/sctp/user.h +++ b/include/net/sctp/user.h | |||
| @@ -100,8 +100,8 @@ typedef __s32 sctp_assoc_t; | |||
| 100 | #define SCTP_SOCKOPT_PEELOFF 102 /* peel off association. */ | 100 | #define SCTP_SOCKOPT_PEELOFF 102 /* peel off association. */ |
| 101 | /* 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 */ |
| 102 | #define SCTP_SOCKOPT_CONNECTX_OLD 107 /* CONNECTX old requests. */ | 102 | #define SCTP_SOCKOPT_CONNECTX_OLD 107 /* CONNECTX old requests. */ |
| 103 | #define SCTP_GET_PEER_ADDRS 108 /* Get all peer addresss. */ | 103 | #define SCTP_GET_PEER_ADDRS 108 /* Get all peer address. */ |
| 104 | #define SCTP_GET_LOCAL_ADDRS 109 /* Get all local addresss. */ | 104 | #define SCTP_GET_LOCAL_ADDRS 109 /* Get all local address. */ |
| 105 | #define SCTP_SOCKOPT_CONNECTX 110 /* CONNECTX requests. */ | 105 | #define SCTP_SOCKOPT_CONNECTX 110 /* CONNECTX requests. */ |
| 106 | #define SCTP_SOCKOPT_CONNECTX3 111 /* CONNECTX requests (updated) */ | 106 | #define SCTP_SOCKOPT_CONNECTX3 111 /* CONNECTX requests (updated) */ |
| 107 | 107 | ||