diff options
| -rw-r--r-- | sys/kern/kern_mbuf.c | 2 | ||||
| -rw-r--r-- | sys/sys/mbuf.h | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index a9777ef..967fea1 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -447,7 +447,7 @@ mb_dtor_mbuf(void *mem, int size, void *arg) m = (struct mbuf *)mem; flags = (unsigned long)arg; - if ((flags & MB_NOTAGS) == 0 && (m->m_flags & M_PKTHDR) != 0) + if ((m->m_flags & M_PKTHDR) && !SLIST_EMPTY(&m->m_pkthdr.tags)) m_tag_delete_chain(m, NULL); KASSERT((m->m_flags & M_EXT) == 0, ("%s: M_EXT set", __func__)); KASSERT((m->m_flags & M_NOFREE) == 0, ("%s: M_NOFREE set", __func__)); diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index ed56ea5..6ba3f16 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -453,8 +453,6 @@ struct mbuf { #define MT_NOINIT 255 /* Not a type but a flag to allocate a non-initialized mbuf */ -#define MB_NOTAGS 0x1UL /* no tags attached to mbuf */ - /* * Compatibility with historic mbuf allocator. */ @@ -636,17 +634,6 @@ m_getcl(int how, short type, int flags) return (uma_zalloc_arg(zone_pack, &args, how)); } -static __inline void -m_free_fast(struct mbuf *m) -{ -#ifdef INVARIANTS - if (m->m_flags & M_PKTHDR) - KASSERT(SLIST_EMPTY(&m->m_pkthdr.tags), ("doing fast free of mbuf with tags")); -#endif - - uma_zfree_arg(zone_mbuf, m, (void *)MB_NOTAGS); -} - static __inline struct mbuf * m_free(struct mbuf *m) { |
