34c34
< * $FreeBSD: head/sys/sys/mbuf.h 105530 2002-10-20 16:55:52Z phk $
---
> * $FreeBSD: head/sys/sys/mbuf.h 108466 2002-12-30 20:22:40Z sam $
180,181c180,182
< #define M_COPYFLAGS (M_PKTHDR|M_EOR|M_PROTO1|M_PROTO1|M_PROTO2|M_PROTO3 | \
< M_PROTO4|M_PROTO5|M_BCAST|M_MCAST|M_FRAG|M_RDONLY)
---
> #define M_COPYFLAGS (M_PKTHDR|M_EOR|M_RDONLY|M_PROTO1|M_PROTO1|M_PROTO2|\
> M_PROTO3|M_PROTO4|M_PROTO5|M_BCAST|M_MCAST|\
> M_FRAG|M_FIRSTFRAG|M_LASTFRAG)
297c298,299
< #define M_COPY_PKTHDR(to, from) m_copy_pkthdr((to), (from))
---
> /* NB: M_COPY_PKTHDR is deprecated, use M_MOVE_PKTHDR or m_dup_pktdr */
> #define M_MOVE_PKTHDR(to, from) m_move_pkthdr((to), (from))
430a433
> int m_dup_pkthdr(struct mbuf *, struct mbuf *, int);
440a444
> void m_move_pkthdr(struct mbuf *, struct mbuf *);
531,532c535,536
< struct m_tag *m_tag_copy(struct m_tag *);
< int m_tag_copy_chain(struct mbuf *, struct mbuf *);
---
> struct m_tag *m_tag_copy(struct m_tag *, int);
> int m_tag_copy_chain(struct mbuf *, struct mbuf *, int);