36c36
< __FBSDID("$FreeBSD: head/sys/kern/uipc_syscalls.c 176498 2008-02-24 00:07:00Z cperciva $");
---
> __FBSDID("$FreeBSD: head/sys/kern/uipc_syscalls.c 177599 2008-03-25 09:39:02Z ru $");
708,717c708,712
< M_PREPEND(control, sizeof(*cm), M_TRYWAIT);
< if (control == 0) {
< error = ENOBUFS;
< goto bad;
< } else {
< cm = mtod(control, struct cmsghdr *);
< cm->cmsg_len = control->m_len;
< cm->cmsg_level = SOL_SOCKET;
< cm->cmsg_type = SCM_RIGHTS;
< }
---
> M_PREPEND(control, sizeof(*cm), M_WAIT);
> cm = mtod(control, struct cmsghdr *);
> cm->cmsg_len = control->m_len;
> cm->cmsg_level = SOL_SOCKET;
> cm->cmsg_type = SCM_RIGHTS;
1630,1639c1625,1627
< m = m_get(M_TRYWAIT, type);
< if (m == NULL)
< return (ENOBUFS);
< if ((u_int)buflen > MLEN) {
< MCLGET(m, M_TRYWAIT);
< if ((m->m_flags & M_EXT) == 0) {
< m_free(m);
< return (ENOBUFS);
< }
< }
---
> m = m_get(M_WAIT, type);
> if ((u_int)buflen > MLEN)
> MCLGET(m, M_WAIT);