summaryrefslogtreecommitdiff
path: root/sys/netinet6
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-06-27 03:49:56 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-06-27 03:49:56 +0000
commit5a60def576e7a9fc33be3c2ce84e9c5a4ea87acf (patch)
treeeec94d4164616ff7c03e306b4723bda222307b2f /sys/netinet6
parentcc7d393f894b86439bc3d6e082a11123747a46bd (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/netinet6')
-rw-r--r--sys/netinet6/icmp6.c4
-rw-r--r--sys/netinet6/ip6_output.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 32a4078bb2f..4d94d183eaa 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.c,v 1.46 2001/06/26 19:58:57 itojun Exp $ */
+/* $OpenBSD: icmp6.c,v 1.47 2001/06/27 03:49:54 angelos Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -609,7 +609,7 @@ icmp6_input(mp, offp, proto)
m_freem(n0);
break;
}
- M_COPY_PKTHDR(n, n0);
+ M_MOVE_PKTHDR(n, n0);
/*
* Copy IPv6 and ICMPv6 only.
*/
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 1ad8295e6aa..a1fc7cf1474 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_output.c,v 1.45 2001/06/27 01:36:02 angelos Exp $ */
+/* $OpenBSD: ip6_output.c,v 1.46 2001/06/27 03:49:54 angelos Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -2310,7 +2310,7 @@ ip6_splithdr(m, exthdrs)
m_freem(m);
return ENOBUFS;
}
- M_COPY_PKTHDR(mh, m);
+ M_MOVE_PKTHDR(mh, m);
MH_ALIGN(mh, sizeof(*ip6));
m->m_len -= sizeof(*ip6);
m->m_data += sizeof(*ip6);