Module Name: src
Committed By: msaitoh
Date: Thu Jul 2 09:07:10 UTC 2020
Modified Files:
src/sys/dev/pci: if_bge.c if_sk.c if_tlp_pci.c
Log Message:
prop_data_data_nocopy -> prop_data_value
To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/pci/if_tlp_pci.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/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.345 src/sys/dev/pci/if_bge.c:1.346
--- src/sys/dev/pci/if_bge.c:1.345 Fri Feb 7 00:04:28 2020
+++ src/sys/dev/pci/if_bge.c Thu Jul 2 09:07:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.345 2020/02/07 00:04:28 thorpej Exp $ */
+/* $NetBSD: if_bge.c,v 1.346 2020/07/02 09:07:10 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.345 2020/02/07 00:04:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.346 2020/07/02 09:07:10 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -6359,7 +6359,7 @@ bge_get_eaddr_fw(struct bge_softc *sc, u
if (ea != NULL) {
KASSERT(prop_object_type(ea) == PROP_TYPE_DATA);
KASSERT(prop_data_size(ea) == ETHER_ADDR_LEN);
- memcpy(ether_addr, prop_data_data_nocopy(ea), ETHER_ADDR_LEN);
+ memcpy(ether_addr, prop_data_value(ea), ETHER_ADDR_LEN);
return 0;
}
Index: src/sys/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.105 src/sys/dev/pci/if_sk.c:1.106
--- src/sys/dev/pci/if_sk.c:1.105 Mon Feb 24 12:20:30 2020
+++ src/sys/dev/pci/if_sk.c Thu Jul 2 09:07:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.105 2020/02/24 12:20:30 rin Exp $ */
+/* $NetBSD: if_sk.c,v 1.106 2020/07/02 09:07:10 msaitoh 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.105 2020/02/24 12:20:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.106 2020/07/02 09:07:10 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1247,7 +1247,7 @@ sk_attach(device_t parent, device_t self
*/
KASSERT(prop_object_type(data) == PROP_TYPE_DATA);
KASSERT(prop_data_size(data) == ETHER_ADDR_LEN);
- memcpy(sc_if->sk_enaddr, prop_data_data_nocopy(data),
+ memcpy(sc_if->sk_enaddr, prop_data_value(data),
ETHER_ADDR_LEN);
} else
for (i = 0; i < ETHER_ADDR_LEN; i++)
Index: src/sys/dev/pci/if_tlp_pci.c
diff -u src/sys/dev/pci/if_tlp_pci.c:1.127 src/sys/dev/pci/if_tlp_pci.c:1.128
--- src/sys/dev/pci/if_tlp_pci.c:1.127 Sun Nov 10 21:16:36 2019
+++ src/sys/dev/pci/if_tlp_pci.c Thu Jul 2 09:07:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_pci.c,v 1.127 2019/11/10 21:16:36 chs Exp $ */
+/* $NetBSD: if_tlp_pci.c,v 1.128 2020/07/02 09:07:10 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.127 2019/11/10 21:16:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.128 2020/07/02 09:07:10 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -647,7 +647,7 @@ tlp_pci_attach(device_t parent, device_t
KASSERT(prop_object_type(ea) == PROP_TYPE_DATA);
KASSERT(prop_data_size(ea) == ETHER_ADDR_LEN);
- memcpy(enaddr, prop_data_data_nocopy(ea),
+ memcpy(enaddr, prop_data_value(ea),
ETHER_ADDR_LEN);
sc->sc_srom_addrbits = 6;
@@ -935,7 +935,7 @@ tlp_pci_attach(device_t parent, device_t
if (eaddrprop != NULL
&& prop_data_size(eaddrprop) == ETHER_ADDR_LEN)
memcpy(enaddr,
- prop_data_data_nocopy(eaddrprop),
+ prop_data_value(eaddrprop),
ETHER_ADDR_LEN);
else
memcpy(enaddr, &sc->sc_srom[20],
