diff options
| author | glebius <glebius@FreeBSD.org> | 2014-11-30 13:24:21 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2014-11-30 13:24:21 +0000 |
| commit | 9cadf1b974cb2cde48370352a579e9c6694d5b15 (patch) | |
| tree | fcd9e335b091a7447c168c321acc47998ebd38d2 /sys/kern/uipc_mbuf.c | |
| parent | 06bb6e263e72cf52b6182e26dc5b47a9351e8094 (diff) | |
| download | FreeBSD-src-9cadf1b974cb2cde48370352a579e9c6694d5b15.zip FreeBSD-src-9cadf1b974cb2cde48370352a579e9c6694d5b15.tar.gz | |
Merge from projects/sendfile: extend protocols API to support
sending not ready data:
o Add new flag to pru_send() flags - PRUS_NOTREADY.
o Add new protocol method pru_ready().
Sponsored by: Nginx, Inc.
Sponsored by: Netflix
Diffstat (limited to 'sys/kern/uipc_mbuf.c')
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 32342689..3880456 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -388,7 +388,7 @@ mb_dupcl(struct mbuf *n, struct mbuf *m) * cleaned too. */ void -m_demote(struct mbuf *m0, int all) +m_demote(struct mbuf *m0, int all, int flags) { struct mbuf *m; @@ -400,7 +400,7 @@ m_demote(struct mbuf *m0, int all) m->m_flags &= ~M_PKTHDR; bzero(&m->m_pkthdr, sizeof(struct pkthdr)); } - m->m_flags = m->m_flags & (M_EXT|M_RDONLY|M_NOFREE); + m->m_flags = m->m_flags & (M_EXT | M_RDONLY | M_NOFREE | flags); } } @@ -997,7 +997,7 @@ m_catpkt(struct mbuf *m, struct mbuf *n) M_ASSERTPKTHDR(n); m->m_pkthdr.len += n->m_pkthdr.len; - m_demote(n, 1); + m_demote(n, 1, 0); m_cat(m, n); } |
