Module Name: src
Committed By: maxv
Date: Sun Apr 29 07:13:10 UTC 2018
Modified Files:
src/sys/kern: uipc_mbuf2.c uipc_socket2.c
src/sys/net: if_ethersubr.c if_fddisubr.c
src/sys/sys: mbuf.h
Log Message:
Remove references to m_copy in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/kern/uipc_mbuf2.c
cvs rdiff -u -r1.128 -r1.129 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.264 -r1.265 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.106 -r1.107 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.199 -r1.200 src/sys/sys/mbuf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_mbuf2.c
diff -u src/sys/kern/uipc_mbuf2.c:1.31 src/sys/kern/uipc_mbuf2.c:1.32
--- src/sys/kern/uipc_mbuf2.c:1.31 Sat Apr 14 08:13:58 2018
+++ src/sys/kern/uipc_mbuf2.c Sun Apr 29 07:13:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf2.c,v 1.31 2018/04/14 08:13:58 maxv Exp $ */
+/* $NetBSD: uipc_mbuf2.c,v 1.32 2018/04/29 07:13:10 maxv Exp $ */
/* $KAME: uipc_mbuf2.c,v 1.29 2001/02/14 13:42:10 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf2.c,v 1.31 2018/04/14 08:13:58 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf2.c,v 1.32 2018/04/29 07:13:10 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,7 +191,7 @@ m_pulldown(struct mbuf *m, int off, int
}
/*
- * 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 copy as there's no room
* on both ends.
*/
o = m_get(M_DONTWAIT, m->m_type);
Index: src/sys/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.128 src/sys/kern/uipc_socket2.c:1.129
--- src/sys/kern/uipc_socket2.c:1.128 Mon Mar 19 16:26:26 2018
+++ src/sys/kern/uipc_socket2.c Sun Apr 29 07:13:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket2.c,v 1.128 2018/03/19 16:26:26 roy Exp $ */
+/* $NetBSD: uipc_socket2.c,v 1.129 2018/04/29 07:13:10 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.128 2018/03/19 16:26:26 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.129 2018/04/29 07:13:10 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -725,7 +725,7 @@ sbrelease(struct sockbuf *sb, struct soc
*
* 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.
*/
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.264 src/sys/net/if_ethersubr.c:1.265
--- src/sys/net/if_ethersubr.c:1.264 Thu Apr 26 19:56:55 2018
+++ src/sys/net/if_ethersubr.c Sun Apr 29 07:13:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.264 2018/04/26 19:56:55 maxv Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.265 2018/04/29 07:13: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.264 2018/04/26 19:56:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.265 2018/04/29 07:13:10 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -328,9 +328,9 @@ ether_output(struct ifnet * const ifp0,
/*
* In the phase 2 case, we need to prepend an mbuf for the
- * llc header. Since we must preserve the value of m,
- * which is passed to us by value, we m_copy() the first
- * mbuf, and use it for our llc header.
+ * llc header.
+ *
+ * XXX XXX: Do we need to preserve the value of m?
*/
if (aa->aa_flags & AFA_PHASE2) {
struct llc llc;
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.106 src/sys/net/if_fddisubr.c:1.107
--- src/sys/net/if_fddisubr.c:1.106 Thu Apr 26 19:56:55 2018
+++ src/sys/net/if_fddisubr.c Sun Apr 29 07:13:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.106 2018/04/26 19:56:55 maxv Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.107 2018/04/29 07:13: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.106 2018/04/26 19:56:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.107 2018/04/29 07:13:10 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -322,9 +322,9 @@ fddi_output(struct ifnet *ifp0, struct m
/*
* In the phase 2 case, we need to prepend an mbuf for the llc
- * header. Since we must preserve the value of m, which is
- * passed to us by value, we m_copy() the first mbuf, and use
- * it for our llc header.
+ * header.
+ *
+ * XXX XXX: Do we need to preserve the value of m?
*/
if (aa->aa_flags & AFA_PHASE2) {
struct llc llc;
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.199 src/sys/sys/mbuf.h:1.200
--- src/sys/sys/mbuf.h:1.199 Sun Apr 29 06:52:55 2018
+++ src/sys/sys/mbuf.h Sun Apr 29 07:13:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.199 2018/04/29 06:52:55 maxv Exp $ */
+/* $NetBSD: mbuf.h,v 1.200 2018/04/29 07:13:10 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -633,7 +633,7 @@ do { \
#define M_VERIFY_PACKET(m) /* nothing */
#endif
-/* length to m_copy to copy all */
+/* The "copy all" special length. */
#define M_COPYALL -1
/* compatibility with 4.3 */
