diff options
| author | bmilekic <bmilekic@FreeBSD.org> | 2004-06-01 16:17:10 +0000 |
|---|---|---|
| committer | bmilekic <bmilekic@FreeBSD.org> | 2004-06-01 16:17:10 +0000 |
| commit | 9e06a1e05abc0cec47d35f94cd372e908733d300 (patch) | |
| tree | 39c60e34f9783dff1da31f2e77e36907161ffd7b /sys/kern/kern_mbuf.c | |
| parent | 0fae2f30f5450deba7752c8e977a304491a5385e (diff) | |
| download | FreeBSD-src-9e06a1e05abc0cec47d35f94cd372e908733d300.zip FreeBSD-src-9e06a1e05abc0cec47d35f94cd372e908733d300.tar.gz | |
Fix a couple of bugs in the mbuf and packet ctors. In the latter case,
nextpkt within the m_hdr was not being initialized to NULL for
!M_PKTHDR cases. *Maybe* this will fix weird socket buffer
inconsistency panics, but we'll see.
Diffstat (limited to 'sys/kern/kern_mbuf.c')
| -rw-r--r-- | sys/kern/kern_mbuf.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 2bec5ad..f2badd6 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -198,9 +198,9 @@ mb_ctor_mbuf(void *mem, int size, void *arg) m->m_type = type; m->m_next = NULL; m->m_nextpkt = NULL; + m->m_flags = flags; if (flags & M_PKTHDR) { m->m_data = m->m_pktdat; - m->m_flags = M_PKTHDR; m->m_pkthdr.rcvif = NULL; m->m_pkthdr.csum_flags = 0; SLIST_INIT(&m->m_pkthdr.tags); @@ -212,10 +212,8 @@ mb_ctor_mbuf(void *mem, int size, void *arg) /* return 0; */ } #endif - } else { + } else m->m_data = m->m_dat; - m->m_flags = 0; - } mbstat.m_mbufs += 1; /* XXX */ /* return 1; */ @@ -333,6 +331,7 @@ mb_ctor_pack(void *mem, int size, void *arg) m->m_type = type; m->m_next = NULL; + m->m_nextpkt = NULL; m->m_data = m->m_ext.ext_buf; m->m_flags = flags|M_EXT; m->m_ext.ext_free = NULL; @@ -342,7 +341,6 @@ mb_ctor_pack(void *mem, int size, void *arg) *(m->m_ext.ref_cnt) = 1; if (flags & M_PKTHDR) { - m->m_nextpkt = NULL; m->m_pkthdr.rcvif = NULL; m->m_pkthdr.csum_flags = 0; SLIST_INIT(&m->m_pkthdr.tags); |
