summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/kern/uipc_mbuf2.c4
-rw-r--r--sys/kern/uipc_socket.c6
-rw-r--r--sys/kern/uipc_socket2.c4
-rw-r--r--sys/kern/uipc_usrreq.c4
-rw-r--r--sys/net/if_ethersubr.c4
-rw-r--r--sys/net/pf.c4
-rw-r--r--sys/net/raw_usrreq.c4
-rw-r--r--sys/net/rtsock.c4
-rw-r--r--sys/netinet/ip_mroute.c16
-rw-r--r--sys/netinet/ip_output.c4
-rw-r--r--sys/netinet/raw_ip.c4
-rw-r--r--sys/netinet/tcp_output.c5
-rw-r--r--sys/netinet/udp_usrreq.c5
-rw-r--r--sys/netinet6/icmp6.c4
-rw-r--r--sys/netinet6/ip6_forward.c5
-rw-r--r--sys/netinet6/ip6_mroute.c13
-rw-r--r--sys/netinet6/ip6_output.c4
-rw-r--r--sys/netinet6/raw_ip6.c4
-rw-r--r--sys/sys/mbuf.h5
19 files changed, 52 insertions, 51 deletions
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c
index ec63e3e764b..c133861834b 100644
--- a/sys/kern/uipc_mbuf2.c
+++ b/sys/kern/uipc_mbuf2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_mbuf2.c,v 1.40 2014/12/11 19:21:57 tedu Exp $ */
+/* $OpenBSD: uipc_mbuf2.c,v 1.41 2015/06/30 15:30:17 mpi Exp $ */
/* $KAME: uipc_mbuf2.c,v 1.29 2001/02/14 13:42:10 itojun Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $ */
@@ -175,7 +175,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
}
/*
- * now, we need to do the hard way. don't m_copy as there's no room
+ * now, we need to do the hard way. don't m_copym as there's no room
* on both ends.
*/
if (len > MAXMCLBYTES) {
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 808653cb06b..2ab84530751 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_socket.c,v 1.139 2015/06/16 11:09:39 mpi Exp $ */
+/* $OpenBSD: uipc_socket.c,v 1.140 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */
/*
@@ -751,7 +751,7 @@ dontblock:
orig_resid = 0;
if (flags & MSG_PEEK) {
if (paddr)
- *paddr = m_copy(m, 0, m->m_len);
+ *paddr = m_copym(m, 0, m->m_len, M_NOWAIT);
m = m->m_next;
} else {
sbfree(&so->so_rcv, m);
@@ -770,7 +770,7 @@ dontblock:
while (m && m->m_type == MT_CONTROL && error == 0) {
if (flags & MSG_PEEK) {
if (controlp)
- *controlp = m_copy(m, 0, m->m_len);
+ *controlp = m_copym(m, 0, m->m_len, M_NOWAIT);
m = m->m_next;
} else {
sbfree(&so->so_rcv, m);
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index eb6c7ee6bf1..49e9ccc5492 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_socket2.c,v 1.60 2015/03/14 03:38:51 jsg Exp $ */
+/* $OpenBSD: uipc_socket2.c,v 1.61 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */
/*
@@ -452,7 +452,7 @@ sbrelease(struct sockbuf *sb)
*
* Reliable protocols may use the socket send buffer to hold data
* awaiting acknowledgement. Data is normally copied from a socket
- * send buffer in a protocol with m_copy for output to a peer,
+ * send buffer in a protocol with m_copym for output to a peer,
* and then removing the data from the socket buffer with sbdrop()
* or sbdroprecord() when the data is acknowledged by the peer.
*/
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 1dbe967a268..17631ed75bd 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_usrreq.c,v 1.80 2015/03/28 23:50:55 bluhm Exp $ */
+/* $OpenBSD: uipc_usrreq.c,v 1.81 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */
/*
@@ -525,7 +525,7 @@ unp_connect(struct socket *so, struct mbuf *nam, struct proc *p)
unp3 = sotounpcb(so3);
if (unp2->unp_addr)
unp3->unp_addr =
- m_copy(unp2->unp_addr, 0, (int)M_COPYALL);
+ m_copym(unp2->unp_addr, 0, M_COPYALL, M_NOWAIT);
unp3->unp_connid.uid = p->p_ucred->cr_uid;
unp3->unp_connid.gid = p->p_ucred->cr_gid;
unp3->unp_connid.pid = p->p_p->ps_pid;
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 0f5b66ae9a7..42502082023 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.212 2015/06/30 13:54:42 mpi Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.213 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -189,7 +189,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
/* If broadcasting on a simplex interface, loopback a copy */
if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX) &&
!m->m_pkthdr.pf.routed)
- mcopy = m_copy(m, 0, (int)M_COPYALL);
+ mcopy = m_copym(m, 0, M_COPYALL, M_NOWAIT);
etype = htons(ETHERTYPE_IP);
break;
#ifdef INET6
diff --git a/sys/net/pf.c b/sys/net/pf.c
index a2f7441273a..29efd293ebc 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.920 2015/06/22 15:58:23 mikeb Exp $ */
+/* $OpenBSD: pf.c,v 1.921 2015/06/30 15:30:17 mpi Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -2429,7 +2429,7 @@ pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, sa_family_t af,
{
struct mbuf *m0;
- if ((m0 = m_copy(m, 0, M_COPYALL)) == NULL)
+ if ((m0 = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL)
return;
m0->m_pkthdr.pf.flags |= PF_TAG_GENERATED;
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 6f8f7a11bb2..cb6e6490bb2 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raw_usrreq.c,v 1.19 2015/05/13 10:42:46 jsg Exp $ */
+/* $OpenBSD: raw_usrreq.c,v 1.20 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: raw_usrreq.c,v 1.11 1996/02/13 22:00:43 christos Exp $ */
/*
@@ -106,7 +106,7 @@ raw_input(struct mbuf *m0, ...)
continue;
if (last) {
struct mbuf *n;
- if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
+ if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) != NULL) {
if (sbappendaddr(&last->so_rcv, src,
n, (struct mbuf *)NULL) == 0)
/* should notify about lost packet */
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 48e5ae4d7f6..77a1b956866 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtsock.c,v 1.160 2015/06/16 11:09:40 mpi Exp $ */
+/* $OpenBSD: rtsock.c,v 1.161 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $ */
/*
@@ -402,7 +402,7 @@ route_input(struct mbuf *m0, ...)
if (last) {
struct mbuf *n;
- if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
+ if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) != NULL) {
if (sbspace(&last->so_rcv) < (2 * MSIZE) ||
sbappendaddr(&last->so_rcv, sosrc,
n, (struct mbuf *)NULL) == 0) {
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 876b7ee745b..a74c49f5c55 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_mroute.c,v 1.77 2015/02/09 12:18:19 claudio Exp $ */
+/* $OpenBSD: ip_mroute.c,v 1.78 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: ip_mroute.c,v 1.85 2004/04/26 01:31:57 matt Exp $ */
/*
@@ -1370,7 +1370,7 @@ ip_mforward(struct mbuf *m, struct ifnet *ifp)
splx(s);
return (ENOBUFS);
}
- mb0 = m_copy(m, 0, M_COPYALL);
+ mb0 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
M_PULLUP(mb0, hlen);
if (mb0 == NULL) {
free(rte, M_MRTABLE, 0);
@@ -1411,7 +1411,7 @@ ip_mforward(struct mbuf *m, struct ifnet *ifp)
* Make a copy of the header to send to the user level
* process
*/
- mm = m_copy(m, 0, hlen);
+ mm = m_copym(m, 0, hlen, M_NOWAIT);
M_PULLUP(mm, hlen);
if (mm == NULL)
goto fail1;
@@ -1608,7 +1608,7 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt)
if (delta > ASSERT_MSG_TIME) {
struct igmpmsg *im;
int hlen = ip->ip_hl << 2;
- struct mbuf *mm = m_copy(m, 0, hlen);
+ struct mbuf *mm = m_copym(m, 0, hlen, M_NOWAIT);
M_PULLUP(mm, hlen);
if (mm == NULL)
@@ -1679,7 +1679,7 @@ phyint_send(struct ip *ip, struct vif *vifp, struct mbuf *m)
* the IP header is actually copied, not just referenced,
* so that ip_output() only scribbles on the copy.
*/
- mb_copy = m_copy(m, 0, M_COPYALL);
+ mb_copy = m_copym(m, 0, M_COPYALL, M_NOWAIT);
M_PULLUP(mb_copy, hlen);
if (mb_copy == NULL)
return;
@@ -1708,7 +1708,7 @@ encap_send(struct ip *ip, struct vif *vifp, struct mbuf *m)
mb_copy->m_pkthdr.len = len;
mb_copy->m_len = sizeof(multicast_encap_iphdr);
- if ((mb_copy->m_next = m_copy(m, 0, M_COPYALL)) == NULL) {
+ if ((mb_copy->m_next = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
m_freem(mb_copy);
return;
}
@@ -1829,7 +1829,7 @@ pim_register_prepare(struct ip *ip, struct mbuf *m)
* Copy the old packet & pullup its IP header into the
* new mbuf so we can modify it.
*/
- mb_copy = m_copy(m, 0, M_COPYALL);
+ mb_copy = m_copym(m, 0, M_COPYALL, M_NOWAIT);
if (mb_copy == NULL)
return (NULL);
mb_copy = m_pullup(mb_copy, ip->ip_hl << 2);
@@ -2174,7 +2174,7 @@ pim_input(struct mbuf *m, ...)
* actions (e.g., send back PIM_REGISTER_STOP).
* XXX: here m->m_data points to the outer IP header.
*/
- mcp = m_copy(m, 0, iphlen + PIM_REG_MINLEN);
+ mcp = m_copym(m, 0, iphlen + PIM_REG_MINLEN, M_NOWAIT);
if (mcp == NULL) {
log(LOG_ERR, "pim_input: pim register: could not "
"copy register head\n");
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index b3d15f5973f..68c6b353dba 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_output.c,v 1.283 2015/06/16 11:09:40 mpi Exp $ */
+/* $OpenBSD: ip_output.c,v 1.284 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */
/*
@@ -762,7 +762,7 @@ ip_fragment(struct mbuf *m, struct ifnet *ifp, u_long mtu)
else
mhip->ip_off |= IP_MF;
mhip->ip_len = htons((u_int16_t)(len + mhlen));
- m->m_next = m_copy(m0, off, len);
+ m->m_next = m_copym(m0, off, len, M_NOWAIT);
if (m->m_next == 0) {
ipstat.ips_odropped++;
error = ENOBUFS;
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 4a0a64e383b..573a9a0e6d9 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raw_ip.c,v 1.80 2015/06/07 01:25:27 krw Exp $ */
+/* $OpenBSD: raw_ip.c,v 1.81 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $ */
/*
@@ -161,7 +161,7 @@ rip_input(struct mbuf *m, ...)
if (last) {
struct mbuf *n;
- if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
+ if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) != NULL) {
if (last->inp_flags & INP_CONTROLOPTS ||
last->inp_socket->so_options & SO_TIMESTAMP)
ip_savecontrol(last, &opts, ip, n);
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 0c46215d7bd..734403d0c61 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_output.c,v 1.111 2015/06/16 11:09:40 mpi Exp $ */
+/* $OpenBSD: tcp_output.c,v 1.112 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */
/*
@@ -724,7 +724,8 @@ send:
mtod(m, caddr_t) + hdrlen);
m->m_len += len;
} else {
- m->m_next = m_copy(so->so_snd.sb_mb, off, (int) len);
+ m->m_next = m_copym(so->so_snd.sb_mb, off, (int) len,
+ M_NOWAIT);
if (m->m_next == 0) {
(void) m_free(m);
error = ENOBUFS;
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 9dcff8aca59..927712b949a 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp_usrreq.c,v 1.201 2015/06/16 11:09:40 mpi Exp $ */
+/* $OpenBSD: udp_usrreq.c,v 1.202 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */
/*
@@ -454,7 +454,8 @@ udp_input(struct mbuf *m, ...)
if (last != NULL) {
struct mbuf *n;
- if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
+ n = m_copym(m, 0, M_COPYALL, M_NOWAIT);
+ if (n != NULL) {
#ifdef INET6
if (ip6 && (last->inp_flags &
IN6P_CONTROLOPTS ||
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index cfc8ff6b041..553e41055b7 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.c,v 1.159 2015/06/16 11:09:40 mpi Exp $ */
+/* $OpenBSD: icmp6.c,v 1.160 2015/06/30 15:30:17 mpi Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -1114,7 +1114,7 @@ icmp6_rip6_input(struct mbuf **mp, int off)
continue;
if (last) {
struct mbuf *n;
- if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
+ if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) != NULL) {
if (last->inp_flags & IN6P_CONTROLOPTS)
ip6_savecontrol(last, n, &opts);
/* strip intermediate headers */
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index fe8863d2dcf..51cd68f1032 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_forward.c,v 1.76 2015/06/16 11:09:40 mpi Exp $ */
+/* $OpenBSD: ip6_forward.c,v 1.77 2015/06/30 15:30:17 mpi Exp $ */
/* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */
/*
@@ -148,7 +148,8 @@ ip6_forward(struct mbuf *m, int srcrt)
* It is important to save it before IPsec processing as IPsec
* processing may modify the mbuf.
*/
- mcopy = m_copy(m, 0, imin(m->m_pkthdr.len, ICMPV6_PLD_MAXLEN));
+ mcopy = m_copym(m, 0, imin(m->m_pkthdr.len, ICMPV6_PLD_MAXLEN),
+ M_NOWAIT);
#if NPF > 0
reroute:
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index a031115d2e1..c2ea872015b 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1124,7 +1124,7 @@ ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m)
splx(s);
return ENOBUFS;
}
- mb0 = m_copy(m, 0, M_COPYALL);
+ mb0 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
/*
* Pullup packet header if needed before storing it,
* as other references may modify it in the meantime.
@@ -1165,7 +1165,7 @@ ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m)
* Make a copy of the header to send to the user
* level process
*/
- mm = m_copy(mb0, 0, sizeof(struct ip6_hdr));
+ mm = m_copym(mb0, 0, sizeof(struct ip6_hdr), M_NOWAIT);
if (mm == NULL) {
free(rte, M_MRTABLE, 0);
@@ -1394,7 +1394,8 @@ ip6_mdq(struct mbuf *m, struct ifnet *ifp, struct mf6c *rt)
struct mbuf *mm;
struct mrt6msg *im;
- mm = m_copy(m, 0, sizeof(struct ip6_hdr));
+ mm = m_copym(m, 0, sizeof(struct ip6_hdr),
+ M_NOWAIT);
if (mm &&
(M_READONLY(mm) ||
mm->m_len < sizeof(struct ip6_hdr)))
@@ -1508,7 +1509,7 @@ phyint_send6(struct ip6_hdr *ip6, struct mif6 *mifp, struct mbuf *m)
* the IPv6 header is actually copied, not just referenced,
* so that ip6_output() only scribbles on the copy.
*/
- mb_copy = m_copy(m, 0, M_COPYALL);
+ mb_copy = m_copym(m, 0, M_COPYALL, M_NOWAIT);
if (mb_copy &&
(M_READONLY(mb_copy) || mb_copy->m_len < sizeof(struct ip6_hdr)))
mb_copy = m_pullup(mb_copy, sizeof(struct ip6_hdr));
@@ -1628,7 +1629,7 @@ register_send(struct ip6_hdr *ip6, struct mif6 *mif, struct mbuf *m)
mm->m_data += max_linkhdr;
mm->m_len = sizeof(struct ip6_hdr);
- if ((mm->m_next = m_copy(m, 0, M_COPYALL)) == NULL) {
+ if ((mm->m_next = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
m_freem(mm);
return ENOBUFS;
}
@@ -1860,7 +1861,7 @@ pim6_input(struct mbuf **mp, int *offp, int proto)
/*
* make a copy of the whole header to pass to the daemon later.
*/
- mcp = m_copy(m, 0, off + PIM6_REG_MINLEN);
+ mcp = m_copym(m, 0, off + PIM6_REG_MINLEN, M_NOWAIT);
if (mcp == NULL) {
#ifdef MRT6DEBUG
log(LOG_ERR,
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index e85aa0fb8d3..e27975fcd86 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_output.c,v 1.174 2015/06/16 11:09:40 mpi Exp $ */
+/* $OpenBSD: ip6_output.c,v 1.175 2015/06/30 15:30:17 mpi Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -3049,7 +3049,7 @@ ip6_mloopback(struct ifnet *ifp, struct mbuf *m, struct sockaddr_in6 *dst)
/*
* Duplicate the packet.
*/
- copym = m_copy(m, 0, M_COPYALL);
+ copym = m_copym(m, 0, M_COPYALL, M_NOWAIT);
if (copym == NULL)
return;
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 0003bd65627..d3d8bb33440 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raw_ip6.c,v 1.75 2015/06/16 11:09:40 mpi Exp $ */
+/* $OpenBSD: raw_ip6.c,v 1.76 2015/06/30 15:30:17 mpi Exp $ */
/* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */
/*
@@ -183,7 +183,7 @@ rip6_input(struct mbuf **mp, int *offp, int proto)
}
if (last) {
struct mbuf *n;
- if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
+ if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) != NULL) {
if (last->inp_flags & IN6P_CONTROLOPTS)
ip6_savecontrol(last, n, &opts);
/* strip intermediate headers */
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index ce3c7f3b011..7d84825a1ff 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbuf.h,v 1.193 2015/06/25 09:20:20 mpi Exp $ */
+/* $OpenBSD: mbuf.h,v 1.194 2015/06/30 15:30:17 mpi Exp $ */
/* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */
/*
@@ -379,9 +379,6 @@ struct mbuf {
/* length to m_copy to copy all */
#define M_COPYALL 1000000000
-/* compatibility with 4.3 */
-#define m_copy(m, o, l) m_copym((m), (o), (l), M_DONTWAIT)
-
/*
* Mbuf statistics.
* For statistics related to mbuf and cluster allocations, see also the
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 21:32:34 +0000