Index: net/pfkey.c
===================================================================
RCS file: /cvs/src/sys/net/pfkey.c,v
retrieving revision 1.29
diff -u -p -r1.29 pfkey.c
--- net/pfkey.c	22 Mar 2016 11:53:21 -0000	1.29
+++ net/pfkey.c	14 Aug 2016 09:44:20 -0000
@@ -142,7 +142,7 @@ pfkey_sendup(struct socket *socket, stru
 	int s;
 
 	if (more) {
-		if (!(packet2 = m_copym2(packet, 0, M_COPYALL, M_DONTWAIT)))
+		if (!(packet2 = m_dup_pkt(packet, 0, M_DONTWAIT)))
 			return (ENOMEM);
 	} else
 		packet2 = packet;
Index: netinet/ip_output.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_output.c,v
retrieving revision 1.325
diff -u -p -r1.325 ip_output.c
--- netinet/ip_output.c	1 Jul 2016 18:28:58 -0000	1.325
+++ netinet/ip_output.c	14 Aug 2016 09:44:20 -0000
@@ -1696,7 +1696,7 @@ ip_mloopback(struct ifnet *ifp, struct m
 	struct ip *ip;
 	struct mbuf *copym;
 
-	copym = m_copym2(m, 0, M_COPYALL, M_DONTWAIT);
+	copym = m_dup_pkt(m, max_linkhdr, M_DONTWAIT);
 	if (copym != NULL) {
 		/*
 		 * We don't bother to fragment if the IP length is greater
Index: netinet/ip_ah.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_ah.c,v
retrieving revision 1.119
diff -u -p -r1.119 ip_ah.c
--- netinet/ip_ah.c	7 Mar 2016 18:44:00 -0000	1.119
+++ netinet/ip_ah.c	14 Aug 2016 09:44:20 -0000
@@ -1048,7 +1048,7 @@ ah_output(struct mbuf *m, struct tdb *td
 
 	if (mi != NULL) {
 		/* Replace the rest of the mbuf chain. */
-		struct mbuf *n = m_copym2(mi, 0, M_COPYALL, M_DONTWAIT);
+		struct mbuf *n = m_dup_pkt(mi, 0, M_DONTWAIT);
 
 		if (n == NULL) {
 			ahstat.ahs_hdrops++;
Index: netinet/ip_esp.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_esp.c,v
retrieving revision 1.137
diff -u -p -r1.137 ip_esp.c
--- netinet/ip_esp.c	7 Mar 2016 18:44:00 -0000	1.137
+++ netinet/ip_esp.c	14 Aug 2016 09:44:20 -0000
@@ -895,7 +895,7 @@ esp_output(struct mbuf *m, struct tdb *t
 
 	if (mi != NULL)	{
 		/* Replace the rest of the mbuf chain. */
-		struct mbuf *n = m_copym2(mi, 0, M_COPYALL, M_DONTWAIT);
+		struct mbuf *n = m_dup_pkt(mi, 0, M_DONTWAIT);
 
 		if (n == NULL) {
 			DPRINTF(("esp_output(): bad mbuf chain, SA %s/%08x\n",
Index: netinet/ip_ipcomp.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_ipcomp.c,v
retrieving revision 1.44
diff -u -p -r1.44 ip_ipcomp.c
--- netinet/ip_ipcomp.c	15 Jul 2015 22:16:42 -0000	1.44
+++ netinet/ip_ipcomp.c	14 Aug 2016 09:44:20 -0000
@@ -473,7 +473,7 @@ ipcomp_output(m, tdb, mp, skip, protoff)
 
 	if (mi != NULL) {
 		/* Replace the rest of the mbuf chain. */
-		struct mbuf    *n = m_copym2(mi, 0, M_COPYALL, M_DONTWAIT);
+		struct mbuf    *n = m_dup_pkt(mi, 0, M_DONTWAIT);
 
 		if (n == NULL) {
 			DPRINTF(("ipcomp_output(): bad mbuf chain, IPCA %s/%08x\n",