diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 13:16:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 13:16:40 -0700 |
commit | 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 (patch) | |
tree | 4d4353bb6535aec7822ea71e594154979728e484 /include/net/sctp/ulpqueue.h | |
parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
download | kernel-crypto-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.tar.gz kernel-crypto-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.tar.xz kernel-crypto-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/sctp/ulpqueue.h')
-rw-r--r-- | include/net/sctp/ulpqueue.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/net/sctp/ulpqueue.h b/include/net/sctp/ulpqueue.h index 961736d29d2..1a60c6d943c 100644 --- a/include/net/sctp/ulpqueue.h +++ b/include/net/sctp/ulpqueue.h @@ -62,19 +62,22 @@ struct sctp_ulpq *sctp_ulpq_init(struct sctp_ulpq *, void sctp_ulpq_free(struct sctp_ulpq *); /* Add a new DATA chunk for processing. */ -int sctp_ulpq_tail_data(struct sctp_ulpq *, struct sctp_chunk *, int); +int sctp_ulpq_tail_data(struct sctp_ulpq *, struct sctp_chunk *, + unsigned int __nocast); /* Add a new event for propagation to the ULP. */ int sctp_ulpq_tail_event(struct sctp_ulpq *, struct sctp_ulpevent *ev); /* Renege previously received chunks. */ -void sctp_ulpq_renege(struct sctp_ulpq *, struct sctp_chunk *, int); +void sctp_ulpq_renege(struct sctp_ulpq *, struct sctp_chunk *, + unsigned int __nocast); /* Perform partial delivery. */ -void sctp_ulpq_partial_delivery(struct sctp_ulpq *, struct sctp_chunk *, int); +void sctp_ulpq_partial_delivery(struct sctp_ulpq *, struct sctp_chunk *, + unsigned int __nocast); /* Abort the partial delivery. */ -void sctp_ulpq_abort_pd(struct sctp_ulpq *, int); +void sctp_ulpq_abort_pd(struct sctp_ulpq *, unsigned int __nocast); /* Clear the partial data delivery condition on this socket. */ int sctp_clear_pd(struct sock *sk); |