Module Name: src
Committed By: maxv
Date: Wed May 9 06:35:10 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
src/sys/netinet6: ip6_output.c
Log Message:
Replace
m_copym(m, 0, M_COPYALL, M_DONTWAIT)
by
m_copypacket(m, M_DONTWAIT)
when it is clear that we are copying a packet (that has M_PKTHDR) and not
a raw mbuf chain.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.265 -r1.266 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.108 -r1.109 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.61 -r1.62 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.82 -r1.83 src/sys/net/if_tokensubr.c
cvs rdiff -u -r1.60 -r1.61 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.208 -r1.209 src/sys/netinet6/ip6_output.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.79 src/sys/net/if_arcsubr.c:1.80
--- src/sys/net/if_arcsubr.c:1.79 Thu Apr 26 19:56:55 2018
+++ src/sys/net/if_arcsubr.c Wed May 9 06:35:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.79 2018/04/26 19:56:55 maxv Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.80 2018/05/09 06:35:10 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.79 2018/04/26 19:56:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.80 2018/05/09 06:35:10 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_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
+ mcopy = m_copypacket(m, 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.265 src/sys/net/if_ethersubr.c:1.266
--- src/sys/net/if_ethersubr.c:1.265 Sun Apr 29 07:13:10 2018
+++ src/sys/net/if_ethersubr.c Wed May 9 06:35:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.265 2018/04/29 07:13:10 maxv Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.266 2018/05/09 06:35:10 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.265 2018/04/29 07:13:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.266 2018/05/09 06:35:10 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_copym(m, 0, M_COPYALL, M_DONTWAIT);
+ mcopy = m_copypacket(m, M_DONTWAIT);
etype = htons(ETHERTYPE_IP);
break;
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.108 src/sys/net/if_fddisubr.c:1.109
--- src/sys/net/if_fddisubr.c:1.108 Sun Apr 29 07:16:28 2018
+++ src/sys/net/if_fddisubr.c Wed May 9 06:35:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.108 2018/04/29 07:16:28 maxv Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.109 2018/05/09 06:35:10 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.108 2018/04/29 07:16:28 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.109 2018/05/09 06:35:10 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_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
+ mcopy = m_copypacket(m, M_DONTWAIT);
etype = htons(ETHERTYPE_IP);
break;
}
Index: src/sys/net/if_ieee1394subr.c
diff -u src/sys/net/if_ieee1394subr.c:1.61 src/sys/net/if_ieee1394subr.c:1.62
--- src/sys/net/if_ieee1394subr.c:1.61 Mon May 7 09:51:02 2018
+++ src/sys/net/if_ieee1394subr.c Wed May 9 06:35:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ieee1394subr.c,v 1.61 2018/05/07 09:51:02 maxv Exp $ */
+/* $NetBSD: if_ieee1394subr.c,v 1.62 2018/05/09 06:35:10 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.61 2018/05/07 09:51:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.62 2018/05/09 06:35:10 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_copym(m0, 0, M_COPYALL, M_DONTWAIT);
+ mcopy = m_copypacket(m0, M_DONTWAIT);
etype = htons(ETHERTYPE_IP);
break;
case AF_ARP:
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.82 src/sys/net/if_tokensubr.c:1.83
--- src/sys/net/if_tokensubr.c:1.82 Thu Apr 26 19:56:55 2018
+++ src/sys/net/if_tokensubr.c Wed May 9 06:35:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.82 2018/04/26 19:56:55 maxv Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.83 2018/05/09 06:35:10 maxv Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.82 2018/04/26 19:56:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.83 2018/05/09 06:35:10 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_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
+ mcopy = m_copypacket(m, M_DONTWAIT);
etype = htons(ETHERTYPE_IP);
break;
case AF_ARP:
Index: src/sys/net/raw_usrreq.c
diff -u src/sys/net/raw_usrreq.c:1.60 src/sys/net/raw_usrreq.c:1.61
--- src/sys/net/raw_usrreq.c:1.60 Thu Apr 26 19:56:55 2018
+++ src/sys/net/raw_usrreq.c Wed May 9 06:35:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_usrreq.c,v 1.60 2018/04/26 19:56:55 maxv Exp $ */
+/* $NetBSD: raw_usrreq.c,v 1.61 2018/05/09 06:35:10 maxv Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.60 2018/04/26 19:56:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.61 2018/05/09 06:35:10 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_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL ||
+ if ((n = m_copypacket(m, M_DONTWAIT)) == NULL ||
sbappendaddr(&last->so_rcv, src, n, NULL) == 0)
{
if (n != NULL)
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.208 src/sys/netinet6/ip6_output.c:1.209
--- src/sys/netinet6/ip6_output.c:1.208 Tue May 1 07:21:39 2018
+++ src/sys/netinet6/ip6_output.c Wed May 9 06:35:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.208 2018/05/01 07:21:39 maxv Exp $ */
+/* $NetBSD: ip6_output.c,v 1.209 2018/05/09 06:35:10 maxv Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.208 2018/05/01 07:21:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.209 2018/05/09 06:35:10 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3257,7 +3257,7 @@ ip6_mloopback(struct ifnet *ifp, struct
struct mbuf *copym;
struct ip6_hdr *ip6;
- copym = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
+ copym = m_copypacket(m, M_DONTWAIT);
if (copym == NULL)
return;
