summaryrefslogtreecommitdiffstats
path: root/sys/dev/en
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2002-12-30 20:22:40 +0000
committersam <sam@FreeBSD.org>2002-12-30 20:22:40 +0000
commitb16cb0a948acd6a3b5f47aa494607a001944c194 (patch)
tree984c2041a8941be016b4cab972816b51adcc818d /sys/dev/en
parent83fcaa45a1be401bd2ecafa45dbfb492a71532b7 (diff)
downloadFreeBSD-src-b16cb0a948acd6a3b5f47aa494607a001944c194.zip
FreeBSD-src-b16cb0a948acd6a3b5f47aa494607a001944c194.tar.gz
Correct mbuf packet header propagation. Previously, packet headers
were sometimes propagated using M_COPY_PKTHDR which actually did something between a "move" and a "copy" operation. This is replaced by M_MOVE_PKTHDR (which copies the pkthdr contents and "removes" it from the source mbuf) and m_dup_pkthdr which copies the packet header contents including any m_tag chain. This corrects numerous problems whereby mbuf tags could be lost during packet manipulations. These changes also introduce arguments to m_tag_copy and m_tag_copy_chain to specify if the tag copy work should potentially block. This introduces an incompatibility with openbsd which we may want to revisit. Note that move/dup of packet headers does not handle target mbufs that have a cluster bound to them. We may want to support this; for now we watch for it with an assert. Finally, M_COPYFLAGS was updated to include M_FIRSTFRAG|M_LASTFRAG. Supported by: Vernier Networks Reviewed by: Robert Watson <rwatson@FreeBSD.org>
Diffstat (limited to 'sys/dev/en')
-rw-r--r--sys/dev/en/midway.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index 915fd14..ffcc6c9 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -1843,7 +1843,7 @@ STATIC int en_makeexclusive(sc, mm, prev)
return(0);
}
if (m->m_flags & M_PKTHDR)
- M_COPY_PKTHDR(new, m);
+ M_MOVE_PKTHDR(new, m);
MCLGET(new, M_DONTWAIT);
if ((new->m_flags & M_EXT) == 0) {
m_free(new);
OpenPOWER on IntegriCloud