Module Name: src
Committed By: maxv
Date: Thu Nov 15 10:56:30 UTC 2018
Modified Files:
src/share/man/man9: mbuf.9
src/sys/dev/ic: wi.c
src/sys/dev/pci: if_ale.c if_cas.c if_sk.c
src/sys/dev/pcmcia: if_malo_pcmcia.c
src/sys/dev/ppbus: if_plip.c
src/sys/dev/usb: if_umb.c if_upgt.c
src/sys/kern: uipc_mbuf.c
src/sys/sys: mbuf.h
Log Message:
Remove the 'copy' argument from m_devget(), unused. While here rename
off0->off.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/share/man/man9/mbuf.9
cvs rdiff -u -r1.248 -r1.249 src/sys/dev/ic/wi.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_cas.c
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pcmcia/if_malo_pcmcia.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ppbus/if_plip.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/if_umb.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.224 -r1.225 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.213 -r1.214 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/share/man/man9/mbuf.9
diff -u src/share/man/man9/mbuf.9:1.64 src/share/man/man9/mbuf.9:1.65
--- src/share/man/man9/mbuf.9:1.64 Mon May 7 10:53:45 2018
+++ src/share/man/man9/mbuf.9 Thu Nov 15 10:56:29 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbuf.9,v 1.64 2018/05/07 10:53:45 maxv Exp $
+.\" $NetBSD: mbuf.9,v 1.65 2018/11/15 10:56:29 maxv Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -74,7 +74,7 @@
.Ft struct mbuf *
.Fn m_gethdr "int how" "int type"
.Ft struct mbuf *
-.Fn m_devget "char *buf" "int totlen" "int off0" "struct ifnet *ifp" "void (*copy)(const void *, void *, size_t)"
+.Fn m_devget "char *buf" "int totlen" "int off" "struct ifnet *ifp"
.Ft struct mbuf *
.Fn m_copym "struct mbuf *m" "int off" "int len" "int wait"
.Ft struct mbuf *
@@ -254,11 +254,10 @@ from caller.
The
.Fa type
parameter is an mbuf type.
-.It Fn m_devget "char *buf" "int totlen" "int off0" "struct ifnet *ifp" "void (*copy)(const void *, void *, size_t)"
+.It Fn m_devget "char *buf" "int totlen" "int off" "struct ifnet *ifp"
Copies
.Fa len
-bytes from device local memory into mbufs using copy routine
-.Fa copy .
+bytes from device local memory into mbufs.
If parameter
.Fa off
is non-zero, the packet is supposed to be trailer-encapsulated and
Index: src/sys/dev/ic/wi.c
diff -u src/sys/dev/ic/wi.c:1.248 src/sys/dev/ic/wi.c:1.249
--- src/sys/dev/ic/wi.c:1.248 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/wi.c Thu Nov 15 10:56:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wi.c,v 1.248 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: wi.c,v 1.249 2018/11/15 10:56:29 maxv Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.248 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.249 2018/11/15 10:56:29 maxv Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -2512,7 +2512,7 @@ wi_set_cfg(struct ifnet *ifp, u_long cmd
break;
}
/* XXX wi_len looks in u_int8_t, not in u_int16_t */
- m = m_devget((char *)&wreq.wi_val, wreq.wi_len, 0, ifp, NULL);
+ m = m_devget((char *)&wreq.wi_val, wreq.wi_len, 0, ifp);
if (m == NULL) {
error = ENOMEM;
break;
Index: src/sys/dev/pci/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.24 src/sys/dev/pci/if_ale.c:1.25
--- src/sys/dev/pci/if_ale.c:1.24 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_ale.c Thu Nov 15 10:56:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ale.c,v 1.24 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_ale.c,v 1.25 2018/11/15 10:56:29 maxv Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <[email protected]>
@@ -32,7 +32,7 @@
/* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.24 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.25 2018/11/15 10:56:29 maxv Exp $");
#include "vlan.h"
@@ -1526,7 +1526,7 @@ ale_rxeof(struct ale_softc *sc)
* on these low-end consumer ethernet controller.
*/
m = m_devget((char *)(rs + 1), length - ETHER_CRC_LEN,
- 0, ifp, NULL);
+ 0, ifp);
if (m == NULL) {
ifp->if_iqdrops++;
ale_rx_update_page(sc, &rx_page, length, &prod);
Index: src/sys/dev/pci/if_cas.c
diff -u src/sys/dev/pci/if_cas.c:1.27 src/sys/dev/pci/if_cas.c:1.28
--- src/sys/dev/pci/if_cas.c:1.27 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_cas.c Thu Nov 15 10:56:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.27 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_cas.c,v 1.28 2018/11/15 10:56:29 maxv Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.27 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.28 2018/11/15 10:56:29 maxv Exp $");
#ifndef _MODULE
#include "opt_inet.h"
@@ -1289,7 +1289,7 @@ cas_rint(struct cas_softc *sc)
rxs->rxs_dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);
cp = rxs->rxs_kva + off * 256 + ETHER_ALIGN;
- m = m_devget(cp, len, 0, ifp, NULL);
+ m = m_devget(cp, len, 0, ifp);
if (word[0] & CAS_RC0_RELEASE_HDR)
cas_add_rxbuf(sc, idx);
@@ -1320,7 +1320,7 @@ cas_rint(struct cas_softc *sc)
/* XXX We should not be copying the packet here. */
cp = rxs->rxs_kva + off + ETHER_ALIGN;
- m = m_devget(cp, len, 0, ifp, NULL);
+ m = m_devget(cp, len, 0, ifp);
if (word[0] & CAS_RC0_RELEASE_DATA)
cas_add_rxbuf(sc, idx);
Index: src/sys/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.89 src/sys/dev/pci/if_sk.c:1.90
--- src/sys/dev/pci/if_sk.c:1.89 Wed Jul 4 19:26:09 2018
+++ src/sys/dev/pci/if_sk.c Thu Nov 15 10:56:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.89 2018/07/04 19:26:09 jdolecek Exp $ */
+/* $NetBSD: if_sk.c,v 1.90 2018/11/15 10:56:29 maxv Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.89 2018/07/04 19:26:09 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.90 2018/11/15 10:56:29 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2102,7 +2102,7 @@ sk_rxeof(struct sk_if_softc *sc_if)
if (sk_newbuf(sc_if, cur, NULL, dmamap) == ENOBUFS) {
struct mbuf *m0;
m0 = m_devget(mtod(m, char *) - ETHER_ALIGN,
- total_len + ETHER_ALIGN, 0, ifp, NULL);
+ total_len + ETHER_ALIGN, 0, ifp);
sk_newbuf(sc_if, cur, m, dmamap);
if (m0 == NULL) {
aprint_error_dev(sc_if->sk_dev, "no receive "
Index: src/sys/dev/pcmcia/if_malo_pcmcia.c
diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.18 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.19
--- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.18 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pcmcia/if_malo_pcmcia.c Thu Nov 15 10:56:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_malo_pcmcia.c,v 1.18 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_malo_pcmcia.c,v 1.19 2018/11/15 10:56:29 maxv Exp $ */
/* $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.18 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.19 2018/11/15 10:56:29 maxv Exp $");
#ifdef _MODULE
#include <sys/module.h>
@@ -1044,7 +1044,7 @@ cmalo_rx(struct malo_softc *sc)
#define ETHER_ALIGN 2 /* XXX */
/* prepare mbuf */
m = m_devget(sc->sc_data + rxdesc->pkgoffset,
- rxdesc->pkglen, ETHER_ALIGN, ifp, NULL);
+ rxdesc->pkglen, ETHER_ALIGN, ifp);
if (m == NULL) {
DPRINTF(1, "RX m_devget failed\n");
ifp->if_ierrors++;
Index: src/sys/dev/ppbus/if_plip.c
diff -u src/sys/dev/ppbus/if_plip.c:1.32 src/sys/dev/ppbus/if_plip.c:1.33
--- src/sys/dev/ppbus/if_plip.c:1.32 Mon Nov 5 18:37:18 2018
+++ src/sys/dev/ppbus/if_plip.c Thu Nov 15 10:56:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.32 2018/11/05 18:37:18 mlelstv Exp $ */
+/* $NetBSD: if_plip.c,v 1.33 2018/11/15 10:56:30 maxv Exp $ */
/*-
* Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.32 2018/11/05 18:37:18 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.33 2018/11/15 10:56:30 maxv Exp $");
/*
* Parallel port TCP/IP interfaces added. I looked at the driver from
@@ -606,7 +606,7 @@ lp_intr(void *arg)
if (len <= CLPIPHDRLEN)
goto err;
len -= CLPIPHDRLEN;
- top = m_devget(sc->sc_ifbuf + CLPIPHDRLEN, len, 0, ifp, NULL);
+ top = m_devget(sc->sc_ifbuf + CLPIPHDRLEN, len, 0, ifp);
}
/* FreeBSD protocol receiving */
else {
@@ -642,7 +642,7 @@ end:
if (len <= LPIPHDRLEN)
goto err;
len -= LPIPHDRLEN;
- top = m_devget(sc->sc_ifbuf + LPIPHDRLEN, len, 0, ifp, NULL);
+ top = m_devget(sc->sc_ifbuf + LPIPHDRLEN, len, 0, ifp);
}
if (top == NULL) {
Index: src/sys/dev/usb/if_umb.c
diff -u src/sys/dev/usb/if_umb.c:1.6 src/sys/dev/usb/if_umb.c:1.7
--- src/sys/dev/usb/if_umb.c:1.6 Thu Sep 20 09:48:54 2018
+++ src/sys/dev/usb/if_umb.c Thu Nov 15 10:56:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_umb.c,v 1.6 2018/09/20 09:48:54 khorben Exp $ */
+/* $NetBSD: if_umb.c,v 1.7 2018/11/15 10:56:30 maxv Exp $ */
/* $OpenBSD: if_umb.c,v 1.20 2018/09/10 17:00:45 gerhard Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.6 2018/09/20 09:48:54 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.7 2018/11/15 10:56:30 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2026,7 +2026,7 @@ umb_decap(struct umb_softc *sc, struct u
dp = buf + doff;
DPRINTFN(3, "%s: decap %d bytes\n", DEVNAM(sc), dlen);
- m = m_devget(dp, dlen, 0, ifp, NULL);
+ m = m_devget(dp, dlen, 0, ifp);
if (m == NULL) {
ifp->if_iqdrops++;
continue;
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.22 src/sys/dev/usb/if_upgt.c:1.23
--- src/sys/dev/usb/if_upgt.c:1.22 Thu Aug 2 06:09:04 2018
+++ src/sys/dev/usb/if_upgt.c Thu Nov 15 10:56:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.22 2018/08/02 06:09:04 riastradh Exp $ */
+/* $NetBSD: if_upgt.c,v 1.23 2018/11/15 10:56:30 maxv Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.22 2018/08/02 06:09:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.23 2018/11/15 10:56:30 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1842,7 +1842,7 @@ upgt_rx(struct upgt_softc *sc, uint8_t *
/* create mbuf which is suitable for strict alignment archs */
#define ETHER_ALIGN 0
- m = m_devget(rxdesc->data, pkglen, ETHER_ALIGN, ifp, NULL);
+ m = m_devget(rxdesc->data, pkglen, ETHER_ALIGN, ifp);
if (m == NULL) {
DPRINTF(1, "%s: could not create RX mbuf\n",
device_xname(sc->sc_dev));
Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.224 src/sys/kern/uipc_mbuf.c:1.225
--- src/sys/kern/uipc_mbuf.c:1.224 Thu Nov 15 10:37:26 2018
+++ src/sys/kern/uipc_mbuf.c Thu Nov 15 10:56:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.224 2018/11/15 10:37:26 maxv Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.225 2018/11/15 10:56:30 maxv Exp $ */
/*
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.224 2018/11/15 10:37:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.225 2018/11/15 10:56:30 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -1322,13 +1322,12 @@ extpacket:
* Routine to copy from device local memory into mbufs.
*/
struct mbuf *
-m_devget(char *buf, int totlen, int off0, struct ifnet *ifp,
- void (*copy)(const void *from, void *to, size_t len))
+m_devget(char *buf, int totlen, int off, struct ifnet *ifp)
{
struct mbuf *m;
struct mbuf *top = NULL, **mp = ⊤
- int off = off0, len;
char *cp, *epkt;
+ int len;
cp = buf;
epkt = cp + totlen;
@@ -1380,10 +1379,7 @@ m_devget(char *buf, int totlen, int off0
len = m->m_len;
}
- if (copy)
- copy(cp, mtod(m, void *), (size_t)len);
- else
- memcpy(mtod(m, void *), cp, (size_t)len);
+ memcpy(mtod(m, void *), cp, (size_t)len);
cp += len;
*mp = m;
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.213 src/sys/sys/mbuf.h:1.214
--- src/sys/sys/mbuf.h:1.213 Thu Nov 15 10:23:56 2018
+++ src/sys/sys/mbuf.h Thu Nov 15 10:56:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.213 2018/11/15 10:23:56 maxv Exp $ */
+/* $NetBSD: mbuf.h,v 1.214 2018/11/15 10:56:30 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -773,8 +773,7 @@ MALLOC_DECLARE(M_SONAME);
struct mbuf *m_copym(struct mbuf *, int, int, int);
struct mbuf *m_copypacket(struct mbuf *, int);
-struct mbuf *m_devget(char *, int, int, struct ifnet *,
- void (*copy)(const void *, void *, size_t));
+struct mbuf *m_devget(char *, int, int, struct ifnet *);
struct mbuf *m_dup(struct mbuf *, int, int, int);
struct mbuf *m_get(int, int);
struct mbuf *m_gethdr(int, int);
