diff options
| author | andre <andre@FreeBSD.org> | 2009-06-22 19:35:39 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2009-06-22 19:35:39 +0000 |
| commit | 469e8778b5e042cb477ff76e0b63d84360257793 (patch) | |
| tree | ecc68804f34e41b45e17fe5d15eaf4d71dad70cc /sys/kern/uipc_mbuf.c | |
| parent | 73f600f681bdbbbe302c837d8a022c0de1bdb13b (diff) | |
| download | FreeBSD-src-469e8778b5e042cb477ff76e0b63d84360257793.zip FreeBSD-src-469e8778b5e042cb477ff76e0b63d84360257793.tar.gz | |
Update m_demote:
- remove HT_HEADER test (MT_HEADER == MT_DATA for some time now)
- be more pedantic about m_nextpkt in other than first mbuf
- update m_flags to be retained
Diffstat (limited to 'sys/kern/uipc_mbuf.c')
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index a5ddd88..d78bee9 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -320,11 +320,13 @@ m_demote(struct mbuf *m0, int all) m->m_flags &= ~M_PKTHDR; bzero(&m->m_pkthdr, sizeof(struct pkthdr)); } - if (m->m_type == MT_HEADER) - m->m_type = MT_DATA; - if (m != m0 && m->m_nextpkt != NULL) + if (m != m0 && m->m_nextpkt != NULL) { + KASSERT(m->m_nextpkt == NULL, + ("%s: m_nextpkt not NULL", __func__)); + m_freem(m->m_nextpkt); m->m_nextpkt = NULL; - m->m_flags = m->m_flags & (M_EXT|M_EOR|M_RDONLY|M_FREELIST); + } + m->m_flags = m->m_flags & (M_EXT|M_RDONLY|M_FREELIST|M_NOFREE); } } |
