d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple of bugs in the mbuf and packet ctors. In the latter case,

Browse Source 
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.
This commit is contained in:
bmilekic 2004-06-01 16:17:10 +00:00
parent ed9e0f9b61
commit a414d08468
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_mbuf.c
View File

@ -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);