diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-06-27 03:49:56 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-06-27 03:49:56 +0000 |
| commit | 5a60def576e7a9fc33be3c2ce84e9c5a4ea87acf (patch) | |
| tree | eec94d4164616ff7c03e306b4723bda222307b2f /sys/netinet | |
| parent | cc7d393f894b86439bc3d6e082a11123747a46bd (diff) | |
Get rid of M_COPY_* macros; either use M_MOVE_* or M_DUP_*, depending
on how macros should be treated. Code by fgsch@, ok by me and itojun@
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_ether.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c index b862d645997..3e60e45206d 100644 --- a/sys/netinet/ip_ether.c +++ b/sys/netinet/ip_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ether.c,v 1.33 2001/06/26 04:29:05 angelos Exp $ */ +/* $OpenBSD: ip_ether.c,v 1.34 2001/06/27 03:49:53 angelos Exp $ */ /* * The author of this code is Angelos D. Keromytis (kermit@adk.gr) * @@ -350,7 +350,7 @@ etherip_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip, m_freem(m); return ENOBUFS; } - M_COPY_PKTHDR(m0, m); + M_MOVE_PKTHDR(m0, m); m0->m_next = m; m0->m_len = hlen; m0->m_pkthdr.len += hlen; diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 3ad478bd0e3..f529dba7e3a 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.129 2001/06/27 02:52:40 angelos Exp $ */ +/* $OpenBSD: ip_output.c,v 1.130 2001/06/27 03:49:53 angelos Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -848,7 +848,7 @@ ip_insertoptions(m, opt, phlen) MGETHDR(n, M_DONTWAIT, MT_HEADER); if (n == 0) return (m); - M_COPY_HDR(n, m); + M_MOVE_HDR(n, m); n->m_pkthdr.len += optlen; m->m_len -= sizeof(struct ip); m->m_data += sizeof(struct ip); |