From 8b42484e84272522d34d30c40fc1801ea0c9e440 Mon Sep 17 00:00:00 2001 From: Jeffrey Hsu Date: Thu, 9 Jun 2005 02:03:39 +0000 Subject: [PATCH] The header type of a mbuf doesn't change when appended onto a chain. --- sys/dev/netif/em/if_em.c | 3 +-- sys/dev/netif/gx/if_gx.c | 4 +--- sys/dev/netif/re/if_re.c | 4 +--- sys/netinet/ip_output.c | 3 +-- sys/netproto/ipx/ipx_ip.c | 3 +-- sys/netproto/ns/ns_ip.c | 3 +-- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c index 82f1d6d9cd..8a20874ba3 100644 --- a/sys/dev/netif/em/if_em.c +++ b/sys/dev/netif/em/if_em.c @@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /*$FreeBSD: src/sys/dev/em/if_em.c,v 1.2.2.15 2003/06/09 22:10:15 pdeuskar Exp $*/ -/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.34 2005/05/27 19:11:49 joerg Exp $*/ +/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.35 2005/06/09 02:03:38 hsu Exp $*/ #include "if_em.h" #include @@ -2508,7 +2508,6 @@ em_process_receive_interrupts(struct adapter *adapter, int count) adapter->lmp = mp; } else { /* Chain mbuf's together */ - mp->m_flags &= ~M_PKTHDR; /* * Adjust length of previous mbuf in chain if we * received less than 4 bytes in the last descriptor. diff --git a/sys/dev/netif/gx/if_gx.c b/sys/dev/netif/gx/if_gx.c index 476dfad207..7a77abb751 100644 --- a/sys/dev/netif/gx/if_gx.c +++ b/sys/dev/netif/gx/if_gx.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.2.2.3 2001/12/14 19:51:39 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.16 2005/05/27 15:36:09 joerg Exp $ + * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.17 2005/06/09 02:03:38 hsu Exp $ */ #include @@ -1260,7 +1260,6 @@ gx_rxeof(struct gx_softc *gx) gx->gx_pktnextp = &m->m_next; } else { m->m_len = len; - m->m_flags &= ~M_PKTHDR; gx->gx_pkthdr->m_pkthdr.len += len; *(gx->gx_pktnextp) = m; gx->gx_pktnextp = &m->m_next; @@ -1273,7 +1272,6 @@ gx_rxeof(struct gx_softc *gx) m->m_pkthdr.len = len; } else { m->m_len = len; - m->m_flags &= ~M_PKTHDR; gx->gx_pkthdr->m_pkthdr.len += len; *(gx->gx_pktnextp) = m; m = gx->gx_pkthdr; diff --git a/sys/dev/netif/re/if_re.c b/sys/dev/netif/re/if_re.c index f061cf5fd0..5a0c321875 100644 --- a/sys/dev/netif/re/if_re.c +++ b/sys/dev/netif/re/if_re.c @@ -33,7 +33,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/re/if_re.c,v 1.25 2004/06/09 14:34:01 naddy Exp $ - * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.12 2005/05/25 01:44:27 dillon Exp $ + * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.13 2005/06/09 02:03:38 hsu Exp $ */ /* @@ -1398,7 +1398,6 @@ re_rxeof(struct re_softc *sc) if (sc->re_head == NULL) { sc->re_head = sc->re_tail = m; } else { - m->m_flags &= ~M_PKTHDR; sc->re_tail->m_next = m; sc->re_tail = m; } @@ -1468,7 +1467,6 @@ re_rxeof(struct re_softc *sc) m_freem(m); } else { m->m_len -= ETHER_CRC_LEN; - m->m_flags &= ~M_PKTHDR; sc->re_tail->m_next = m; } m = sc->re_head; diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 12d6caecbd..6d420cb5bf 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -28,7 +28,7 @@ * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 * $FreeBSD: src/sys/netinet/ip_output.c,v 1.99.2.37 2003/04/15 06:44:45 silby Exp $ - * $DragonFly: src/sys/netinet/ip_output.c,v 1.29 2005/06/02 23:52:42 dillon Exp $ + * $DragonFly: src/sys/netinet/ip_output.c,v 1.30 2005/06/09 02:03:38 hsu Exp $ */ #define _IP_VHL @@ -999,7 +999,6 @@ pass: m1 = m_split(m, length, MB_DONTWAIT); if (m1 == NULL) break; - m1->m_flags &= ~M_PKTHDR; m2 = m; while (m2->m_next != NULL) m2 = m2->m_next; diff --git a/sys/netproto/ipx/ipx_ip.c b/sys/netproto/ipx/ipx_ip.c index 6644fbf774..7854a098f5 100644 --- a/sys/netproto/ipx/ipx_ip.c +++ b/sys/netproto/ipx/ipx_ip.c @@ -34,7 +34,7 @@ * @(#)ipx_ip.c * * $FreeBSD: src/sys/netipx/ipx_ip.c,v 1.24.2.2 2003/01/23 21:06:48 sam Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_ip.c,v 1.13 2004/06/03 18:30:04 joerg Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_ip.c,v 1.14 2005/06/09 02:03:39 hsu Exp $ */ /* @@ -258,7 +258,6 @@ ipxipoutput(ifp, m, dst, rt) m0->m_next = m; m0->m_len = sizeof(struct ip); m0->m_pkthdr.len = m0->m_len + m->m_len; - m->m_flags &= ~M_PKTHDR; m = m0; } else { M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT); diff --git a/sys/netproto/ns/ns_ip.c b/sys/netproto/ns/ns_ip.c index d898ff22ee..881ae990a4 100644 --- a/sys/netproto/ns/ns_ip.c +++ b/sys/netproto/ns/ns_ip.c @@ -32,7 +32,7 @@ * * @(#)ns_ip.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_ip.c,v 1.9 1999/08/28 00:49:50 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_ip.c,v 1.11 2004/06/07 07:04:33 dillon Exp $ + * $DragonFly: src/sys/netproto/ns/ns_ip.c,v 1.12 2005/06/09 02:03:39 hsu Exp $ */ /* @@ -267,7 +267,6 @@ nsipoutput(ifn, m, dst) m0->m_next = m; m0->m_len = sizeof (struct ip); m0->m_pkthdr.len = m0->m_len + m->m_len; - m->m_flags &= ~M_PKTHDR; } else { M_PREPEND(m, sizeof (struct ip), MB_DONTWAIT); if (m == 0) -- 2.41.0