version 1.133, 2007/02/22 06:34:45 |
version 1.134, 2007/03/04 06:03:11 |
Line 255 sokvafree(vaddr_t sva, vsize_t len) |
|
Line 255 sokvafree(vaddr_t sva, vsize_t len) |
|
} |
} |
|
|
static void |
static void |
sodoloanfree(struct vm_page **pgs, caddr_t buf, size_t size) |
sodoloanfree(struct vm_page **pgs, void *buf, size_t size) |
{ |
{ |
vaddr_t va, sva, eva; |
vaddr_t va, sva, eva; |
vsize_t len; |
vsize_t len; |
|
|
} |
} |
|
|
void |
void |
soloanfree(struct mbuf *m, caddr_t buf, size_t size, void *arg) |
soloanfree(struct mbuf *m, void *buf, size_t size, void *arg) |
{ |
{ |
int s; |
int s; |
|
|
Line 416 sosend_loan(struct socket *so, struct ui |
|
Line 416 sosend_loan(struct socket *so, struct ui |
|
|
|
lva += (vaddr_t) iov->iov_base & PAGE_MASK; |
lva += (vaddr_t) iov->iov_base & PAGE_MASK; |
|
|
MEXTADD(m, (caddr_t) lva, space, M_MBUF, soloanfree, so); |
MEXTADD(m, (void *) lva, space, M_MBUF, soloanfree, so); |
m->m_flags |= M_EXT_PAGES | M_EXT_ROMAP; |
m->m_flags |= M_EXT_PAGES | M_EXT_ROMAP; |
|
|
uio->uio_resid -= space; |
uio->uio_resid -= space; |
/* uio_offset not updated, not set/used for write(2) */ |
/* uio_offset not updated, not set/used for write(2) */ |
uio->uio_iov->iov_base = (caddr_t) uio->uio_iov->iov_base + space; |
uio->uio_iov->iov_base = (char *)uio->uio_iov->iov_base + space; |
uio->uio_iov->iov_len -= space; |
uio->uio_iov->iov_len -= space; |
if (uio->uio_iov->iov_len == 0) { |
if (uio->uio_iov->iov_len == 0) { |
uio->uio_iov++; |
uio->uio_iov++; |
Line 498 socreate(int dom, struct socket **aso, i |
|
Line 498 socreate(int dom, struct socket **aso, i |
|
return (EPROTOTYPE); |
return (EPROTOTYPE); |
s = splsoftnet(); |
s = splsoftnet(); |
so = pool_get(&socket_pool, PR_WAITOK); |
so = pool_get(&socket_pool, PR_WAITOK); |
memset((caddr_t)so, 0, sizeof(*so)); |
memset((void *)so, 0, sizeof(*so)); |
TAILQ_INIT(&so->so_q0); |
TAILQ_INIT(&so->so_q0); |
TAILQ_INIT(&so->so_q); |
TAILQ_INIT(&so->so_q); |
so->so_type = type; |
so->so_type = type; |
Line 624 soclose(struct socket *so) |
|
Line 624 soclose(struct socket *so) |
|
(so->so_state & SS_NBIO)) |
(so->so_state & SS_NBIO)) |
goto drop; |
goto drop; |
while (so->so_state & SS_ISCONNECTED) { |
while (so->so_state & SS_ISCONNECTED) { |
error = tsleep((caddr_t)&so->so_timeo, |
error = tsleep((void *)&so->so_timeo, |
PSOCK | PCATCH, netcls, |
PSOCK | PCATCH, netcls, |
so->so_linger * hz); |
so->so_linger * hz); |
if (error) |
if (error) |
Line 892 sosend(struct socket *so, struct mbuf *a |
|
Line 892 sosend(struct socket *so, struct mbuf *a |
|
if (atomic && top == 0 && len < mlen) |
if (atomic && top == 0 && len < mlen) |
MH_ALIGN(m, len); |
MH_ALIGN(m, len); |
} |
} |
error = uiomove(mtod(m, caddr_t), (int)len, |
error = uiomove(mtod(m, void *), (int)len, |
uio); |
uio); |
have_data: |
have_data: |
resid = uio->uio_resid; |
resid = uio->uio_resid; |
Line 998 soreceive(struct socket *so, struct mbuf |
|
Line 998 soreceive(struct socket *so, struct mbuf |
|
if (error) |
if (error) |
goto bad; |
goto bad; |
do { |
do { |
error = uiomove(mtod(m, caddr_t), |
error = uiomove(mtod(m, void *), |
(int) min(uio->uio_resid, m->m_len), uio); |
(int) min(uio->uio_resid, m->m_len), uio); |
m = m_free(m); |
m = m_free(m); |
} while (uio->uio_resid && error == 0 && m); |
} while (uio->uio_resid && error == 0 && m); |
Line 1212 soreceive(struct socket *so, struct mbuf |
|
Line 1212 soreceive(struct socket *so, struct mbuf |
|
SBLASTRECORDCHK(&so->so_rcv, "soreceive uiomove"); |
SBLASTRECORDCHK(&so->so_rcv, "soreceive uiomove"); |
SBLASTMBUFCHK(&so->so_rcv, "soreceive uiomove"); |
SBLASTMBUFCHK(&so->so_rcv, "soreceive uiomove"); |
splx(s); |
splx(s); |
error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio); |
error = uiomove(mtod(m, char *) + moff, (int)len, uio); |
s = splsoftnet(); |
s = splsoftnet(); |
if (error) { |
if (error) { |
/* |
/* |