diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-28 21:35:02 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-28 21:35:02 -0400 |
| commit | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (patch) | |
| tree | ad36a9c4d93a138fbcd02c1df9fa3a3a321e0cc2 /include | |
| parent | 89fbb69c4f285019ba5e029963dc11cc6beb078a (diff) | |
| parent | 64a0c1c81e300f0f56f26604c81040784e3717f0 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sctp/user.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h index 1c5f19f995ad..f1c3bc54526a 100644 --- a/include/net/sctp/user.h +++ b/include/net/sctp/user.h | |||
| @@ -171,10 +171,10 @@ struct sctp_sndrcvinfo { | |||
| 171 | */ | 171 | */ |
| 172 | 172 | ||
| 173 | enum sctp_sinfo_flags { | 173 | enum sctp_sinfo_flags { |
| 174 | MSG_UNORDERED = 1, /* Send/receive message unordered. */ | 174 | SCTP_UNORDERED = 1, /* Send/receive message unordered. */ |
| 175 | MSG_ADDR_OVER = 2, /* Override the primary destination. */ | 175 | SCTP_ADDR_OVER = 2, /* Override the primary destination. */ |
| 176 | MSG_ABORT=4, /* Send an ABORT message to the peer. */ | 176 | SCTP_ABORT=4, /* Send an ABORT message to the peer. */ |
| 177 | /* MSG_EOF is already defined per socket.h */ | 177 | SCTP_EOF=MSG_FIN, /* Initiate graceful shutdown process. */ |
| 178 | }; | 178 | }; |
| 179 | 179 | ||
| 180 | 180 | ||