summaryrefslogtreecommitdiff
path: root/user_socket.c
diff options
context:
space:
mode:
authort00fcxen <t00fcxen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7>2012-12-10 20:28:19 +0000
committert00fcxen <t00fcxen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7>2012-12-10 20:28:19 +0000
commit218d5d0df143e859e241afb12d6aaa1e4969d714 (patch)
tree98c2da0c0c77982ee89a58227ea2fa128025bdef /user_socket.c
parent68beeca578347438d9c434680197647ed551935f (diff)
downloadusrsctplib-218d5d0df143e859e241afb12d6aaa1e4969d714.tar.gz
Use consistently new defines.
git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8379 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7
Diffstat (limited to 'user_socket.c')
-rwxr-xr-xuser_socket.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/user_socket.c b/user_socket.c
index d56fbb4..ced8d7d 100755
--- a/user_socket.c
+++ b/user_socket.c
@@ -937,7 +937,7 @@ struct mbuf* mbufalloc(size_t size, void* data, unsigned char fill)
/* First one gets a header equal to sizeof(struct sctp_data_chunk) */
left = size;
- head = m = sctp_get_mbuf_for_msg((left + resv_upfront), 1, M_WAIT, 0, MT_DATA);
+ head = m = sctp_get_mbuf_for_msg((left + resv_upfront), 1, M_WAITOK, 0, MT_DATA);
if (m == NULL) {
SCTP_PRINTF("%s: ENOMEN: Memory allocation failure\n", __func__);
return (NULL);
@@ -962,7 +962,7 @@ struct mbuf* mbufalloc(size_t size, void* data, unsigned char fill)
left -= willcpy;
cpsz += willcpy;
if (left > 0) {
- SCTP_BUF_NEXT(m) = sctp_get_mbuf_for_msg(left, 0, M_WAIT, 0, MT_DATA);
+ SCTP_BUF_NEXT(m) = sctp_get_mbuf_for_msg(left, 0, M_WAITOK, 0, MT_DATA);
if (SCTP_BUF_NEXT(m) == NULL) {
/*
* the head goes back to caller, he can free
@@ -1600,7 +1600,7 @@ sowakeup(struct socket *so, struct sockbuf *sb)
if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL)
pgsigio(&so->so_sigio, SIGIO, 0);
if (sb->sb_flags & SB_UPCALL)
- (*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT);
+ (*so->so_upcall)(so, so->so_upcallarg, M_NOWAIT);
if (sb->sb_flags & SB_AIO)
aio_swake(so, sb);
mtx_assert(SOCKBUF_MTX(sb), MA_NOTOWNED);
@@ -3104,7 +3104,7 @@ usrsctp_conninput(void *addr, const void *buffer, size_t length, uint8_t ecn_bit
dst.sconn_len = sizeof(struct sockaddr_conn);
#endif
dst.sconn_addr = addr;
- if ((m = sctp_get_mbuf_for_msg(length, 1, M_DONTWAIT, 0, MT_DATA)) == NULL) {
+ if ((m = sctp_get_mbuf_for_msg(length, 1, M_NOWAIT, 0, MT_DATA)) == NULL) {
return;
}
m_copyback(m, 0, length, (caddr_t)buffer);