summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-10-28 23:35:02 -0200
committerArnaldo Carvalho de Melo <acme@mandriva.com>2005-10-28 23:35:02 -0200
commit974f7bc5781d3fc16e32d8908c6e48592e767dd2 (patch)
treead36a9c4d93a138fbcd02c1df9fa3a3a321e0cc2 /include/net
parent89fbb69c4f285019ba5e029963dc11cc6beb078a (diff)
parent64a0c1c81e300f0f56f26604c81040784e3717f0 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sctp/user.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index 1c5f19f995a..f1c3bc54526 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -171,10 +171,10 @@ struct sctp_sndrcvinfo {
*/
enum sctp_sinfo_flags {
- MSG_UNORDERED = 1, /* Send/receive message unordered. */
- MSG_ADDR_OVER = 2, /* Override the primary destination. */
- MSG_ABORT=4, /* Send an ABORT message to the peer. */
- /* MSG_EOF is already defined per socket.h */
+ SCTP_UNORDERED = 1, /* Send/receive message unordered. */
+ SCTP_ADDR_OVER = 2, /* Override the primary destination. */
+ SCTP_ABORT=4, /* Send an ABORT message to the peer. */
+ SCTP_EOF=MSG_FIN, /* Initiate graceful shutdown process. */
};