diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 15:58:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 15:58:58 -0700 |
commit | fb395884576684ebb54b19b1054f4caed589d5f0 (patch) | |
tree | c941073819d504fb967e4d107e382ec92f51ecf0 /include/net/sctp/user.h | |
parent | 91b90475e793e84a57d956af8c52645e292badcb (diff) | |
parent | 246955fe4c38bd706ae30e37c64892c94213775d (diff) | |
download | op-kernel-dev-fb395884576684ebb54b19b1054f4caed589d5f0.zip op-kernel-dev-fb395884576684ebb54b19b1054f4caed589d5f0.tar.gz |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/sctp/user.h')
-rw-r--r-- | include/net/sctp/user.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h index 2758e8c..f6328ae 100644 --- a/include/net/sctp/user.h +++ b/include/net/sctp/user.h @@ -111,6 +111,8 @@ enum sctp_optname { #define SCTP_GET_LOCAL_ADDRS_NUM SCTP_GET_LOCAL_ADDRS_NUM SCTP_GET_LOCAL_ADDRS, /* Get all local addresss. */ #define SCTP_GET_LOCAL_ADDRS SCTP_GET_LOCAL_ADDRS + SCTP_SOCKOPT_CONNECTX, /* CONNECTX requests. */ +#define SCTP_SOCKOPT_CONNECTX SCTP_SOCKOPT_CONNECTX }; /* @@ -527,6 +529,7 @@ struct sctp_paddrinfo { enum sctp_spinfo_state { SCTP_INACTIVE, SCTP_ACTIVE, + SCTP_UNKNOWN = 0xffff /* Value used for transport state unknown */ }; /* |