diff options
| author | Kevin Lo <kevlo@FreeBSD.org> | 2016-09-15 07:41:48 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@FreeBSD.org> | 2016-09-15 07:41:48 +0000 |
| commit | c3bef61e584084a8f86fba71cb344f15fc20491c (patch) | |
| tree | e55fa8ff38c04c3cbeb8c1f0965d9bc0213f4d61 /sys/netinet/ip_mroute.c | |
| parent | 6c6e3889290a73ddae85c68de44d928a838501ed (diff) | |
| download | src-c3bef61e584084a8f86fba71cb344f15fc20491c.tar.gz src-c3bef61e584084a8f86fba71cb344f15fc20491c.zip | |
Remove the 4.3BSD compatible macro m_copy(), use m_copym() instead.
Reviewed by: gnn
Differential Revision: https://reviews.freebsd.org/D7878
Notes
Notes:
svn path=/head/; revision=305824
Diffstat (limited to 'sys/netinet/ip_mroute.c')
| -rw-r--r-- | sys/netinet/ip_mroute.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index d6164ef90626..c0730caca8f4 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -1344,7 +1344,7 @@ X_ip_mforward(struct ip *ip, struct ifnet *ifp, struct mbuf *m, goto fail; /* Make a copy of the header to send to the user level process */ - mm = m_copy(mb0, 0, hlen); + mm = m_copym(mb0, 0, hlen, M_NOWAIT); if (mm == NULL) goto fail1; @@ -1542,7 +1542,7 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) struct sockaddr_in k_igmpsrc = { sizeof k_igmpsrc, AF_INET }; 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); if (mm && (!M_WRITABLE(mm) || mm->m_len < hlen)) mm = m_pullup(mm, hlen); @@ -2734,9 +2734,9 @@ pim_input(struct mbuf **mp, int *offp, int proto) * 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) { - CTR1(KTR_IPMF, "%s: m_copy() failed", __func__); + CTR1(KTR_IPMF, "%s: m_copym() failed", __func__); m_freem(m); return (IPPROTO_DONE); } |