diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2009-08-09 18:45:31 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2009-08-09 18:45:31 +0000 |
| commit | 5d7b66a78ff2dc9dd3a701515d7edd4b176219a5 (patch) | |
| tree | 2751f9642845e7dc67a4093aaf5558288684afbf | |
| parent | a004cab742974b8d23e4a20b7e75973733a67ef0 (diff) | |
kill M_DUP_HDR. M_DUP_PKTHDR was the only user, we can just put the
3 lines of code in there directly, and we hate the M_ macros anyway.
ok claudio
| -rw-r--r-- | sys/sys/mbuf.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 13be3783a52..5361828673b 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbuf.h,v 1.129 2009/08/09 13:53:03 henning Exp $ */ +/* $OpenBSD: mbuf.h,v 1.130 2009/08/09 18:45:30 henning Exp $ */ /* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */ /* @@ -290,22 +290,15 @@ struct mbuf { } while (/* CONSTCOND */ 0) /* - * Duplicate just m_pkthdr from from to to. - */ -#define M_DUP_HDR(to, from) do { \ - (to)->m_pkthdr = (from)->m_pkthdr; \ - SLIST_INIT(&(to)->m_pkthdr.tags); \ - m_tag_copy_chain((to), (from)); \ -} while (/* CONSTCOND */ 0) - -/* * Duplicate mbuf pkthdr from from to to. * from must have M_PKTHDR set, and to must be empty. */ #define M_DUP_PKTHDR(to, from) do { \ (to)->m_flags = ((to)->m_flags & (M_EXT | M_CLUSTER)); \ (to)->m_flags |= (from)->m_flags & M_COPYFLAGS; \ - M_DUP_HDR((to), (from)); \ + (to)->m_pkthdr = (from)->m_pkthdr; \ + SLIST_INIT(&(to)->m_pkthdr.tags); \ + m_tag_copy_chain((to), (from)); \ if (((to)->m_flags & M_EXT) == 0) \ (to)->m_data = (to)->m_pktdat; \ } while (/* CONSTCOND */ 0) |