Module Name: src
Committed By: maxv
Date: Thu Apr 26 19:56:55 UTC 2018
Modified Files:
src/sys/net: if_arcsubr.c if_ethersubr.c if_fddisubr.c
if_ieee1394subr.c if_tokensubr.c raw_usrreq.c
Log Message:
m_copy -> m_copym
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.263 -r1.264 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.105 -r1.106 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.59 -r1.60 src/sys/net/if_ieee1394subr.c \
src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.81 -r1.82 src/sys/net/if_tokensubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.78 src/sys/net/if_arcsubr.c:1.79
--- src/sys/net/if_arcsubr.c:1.78 Mon Oct 23 09:22:24 2017
+++ src/sys/net/if_arcsubr.c Thu Apr 26 19:56:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.78 2017/10/23 09:22:24 msaitoh Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.79 2018/04/26 19:56:55 maxv Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.78 2017/10/23 09:22:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.79 2018/04/26 19:56:55 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -155,7 +155,7 @@ arc_output(struct ifnet *ifp, struct mbu
/* If broadcasting on a simplex interface, loopback a copy */
if ((m->m_flags & (M_BCAST|M_MCAST)) &&
(ifp->if_flags & IFF_SIMPLEX))
- mcopy = m_copy(m, 0, (int)M_COPYALL);
+ mcopy = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
if (ifp->if_flags & IFF_LINK0) {
atype = ARCTYPE_IP;
newencoding = 1;
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.263 src/sys/net/if_ethersubr.c:1.264
--- src/sys/net/if_ethersubr.c:1.263 Mon Apr 9 16:14:11 2018
+++ src/sys/net/if_ethersubr.c Thu Apr 26 19:56:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.263 2018/04/09 16:14:11 maxv Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.264 2018/04/26 19:56:55 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.263 2018/04/09 16:14:11 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.264 2018/04/26 19:56:55 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -247,7 +247,7 @@ ether_output(struct ifnet * const ifp0,
}
/* If broadcasting on a simplex interface, loopback a copy */
if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
- mcopy = m_copy(m, 0, M_COPYALL);
+ mcopy = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
etype = htons(ETHERTYPE_IP);
break;
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.105 src/sys/net/if_fddisubr.c:1.106
--- src/sys/net/if_fddisubr.c:1.105 Tue Feb 14 03:05:06 2017
+++ src/sys/net/if_fddisubr.c Thu Apr 26 19:56:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.105 2017/02/14 03:05:06 ozaki-r Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.106 2018/04/26 19:56:55 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.105 2017/02/14 03:05:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.106 2018/04/26 19:56:55 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -243,7 +243,7 @@ fddi_output(struct ifnet *ifp0, struct m
return error == EWOULDBLOCK ? 0 : error;
/* If broadcasting on a simplex interface, loopback a copy */
if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
- mcopy = m_copy(m, 0, (int)M_COPYALL);
+ mcopy = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
etype = htons(ETHERTYPE_IP);
break;
}
Index: src/sys/net/if_ieee1394subr.c
diff -u src/sys/net/if_ieee1394subr.c:1.59 src/sys/net/if_ieee1394subr.c:1.60
--- src/sys/net/if_ieee1394subr.c:1.59 Tue Feb 14 03:05:06 2017
+++ src/sys/net/if_ieee1394subr.c Thu Apr 26 19:56:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ieee1394subr.c,v 1.59 2017/02/14 03:05:06 ozaki-r Exp $ */
+/* $NetBSD: if_ieee1394subr.c,v 1.60 2018/04/26 19:56:55 maxv Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.59 2017/02/14 03:05:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.60 2018/04/26 19:56:55 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -143,7 +143,7 @@ ieee1394_output(struct ifnet *ifp, struc
return error == EWOULDBLOCK ? 0 : error;
/* if broadcasting on a simplex interface, loopback a copy */
if ((m0->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
- mcopy = m_copy(m0, 0, M_COPYALL);
+ mcopy = m_copym(m0, 0, M_COPYALL, M_DONTWAIT);
etype = htons(ETHERTYPE_IP);
break;
case AF_ARP:
@@ -298,7 +298,7 @@ ieee1394_fragment(struct ifnet *ifp, str
ifh->ifh_etype_off = htons(off);
ifh->ifh_dgl = htons(ic->ic_dgl);
ifh->ifh_reserved = 0;
- m->m_next = m_copy(m0, sizeof(*ifh) + off, fraglen);
+ m->m_next = m_copym(m0, sizeof(*ifh) + off, fraglen, M_DONTWAIT);
if (m->m_next == NULL) {
m_freem(m);
goto bad;
Index: src/sys/net/raw_usrreq.c
diff -u src/sys/net/raw_usrreq.c:1.59 src/sys/net/raw_usrreq.c:1.60
--- src/sys/net/raw_usrreq.c:1.59 Mon Mar 19 16:26:25 2018
+++ src/sys/net/raw_usrreq.c Thu Apr 26 19:56:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_usrreq.c,v 1.59 2018/03/19 16:26:25 roy Exp $ */
+/* $NetBSD: raw_usrreq.c,v 1.60 2018/04/26 19:56:55 maxv Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.59 2018/03/19 16:26:25 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.60 2018/04/26 19:56:55 maxv Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -107,7 +107,7 @@ raw_input(struct mbuf *m0, ...)
if (last != NULL) {
struct mbuf *n;
- if ((n = m_copy(m, 0, M_COPYALL)) == NULL ||
+ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL ||
sbappendaddr(&last->so_rcv, src, n, NULL) == 0)
{
if (n != NULL)
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.81 src/sys/net/if_tokensubr.c:1.82
--- src/sys/net/if_tokensubr.c:1.81 Tue Jan 31 17:13:36 2017
+++ src/sys/net/if_tokensubr.c Thu Apr 26 19:56:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.81 2017/01/31 17:13:36 maxv Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.82 2018/04/26 19:56:55 maxv Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.81 2017/01/31 17:13:36 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.82 2018/04/26 19:56:55 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -235,7 +235,7 @@ token_output(struct ifnet *ifp0, struct
}
/* If broadcasting on a simplex interface, loopback a copy. */
if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
- mcopy = m_copy(m, 0, (int)M_COPYALL);
+ mcopy = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
etype = htons(ETHERTYPE_IP);
break;
case AF_ARP:
