Module Name: src
Committed By: jmcneill
Date: Sat Jun 27 13:33:26 UTC 2020
Modified Files:
src/sys/dev/usb: if_mue.c if_smsc.c
Log Message:
prop_data_data_nocopy -> prop_data_value
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/if_mue.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/usb/if_smsc.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/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.59 src/sys/dev/usb/if_mue.c:1.60
--- src/sys/dev/usb/if_mue.c:1.59 Sun Mar 15 23:04:50 2020
+++ src/sys/dev/usb/if_mue.c Sat Jun 27 13:33:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mue.c,v 1.59 2020/03/15 23:04:50 thorpej Exp $ */
+/* $NetBSD: if_mue.c,v 1.60 2020/06/27 13:33:26 jmcneill Exp $ */
/* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */
/*
@@ -20,7 +20,7 @@
/* Driver for Microchip LAN7500/LAN7800 chipsets. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.59 2020/03/15 23:04:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.60 2020/06/27 13:33:26 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -732,7 +732,7 @@ mue_get_macaddr(struct usbnet *un, prop_
if (eaprop != NULL) {
KASSERT(prop_object_type(eaprop) == PROP_TYPE_DATA);
KASSERT(prop_data_size(eaprop) == ETHER_ADDR_LEN);
- memcpy(un->un_eaddr, prop_data_data_nocopy(eaprop),
+ memcpy(un->un_eaddr, prop_data_value(eaprop),
ETHER_ADDR_LEN);
if (ETHER_IS_VALID(un->un_eaddr))
return 0;
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.68 src/sys/dev/usb/if_smsc.c:1.69
--- src/sys/dev/usb/if_smsc.c:1.68 Sun Mar 15 23:04:51 2020
+++ src/sys/dev/usb/if_smsc.c Sat Jun 27 13:33:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.68 2020/03/15 23:04:51 thorpej Exp $ */
+/* $NetBSD: if_smsc.c,v 1.69 2020/06/27 13:33:26 jmcneill Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.68 2020/03/15 23:04:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.69 2020/06/27 13:33:26 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -896,7 +896,7 @@ smsc_attach(device_t parent, device_t se
if (eaprop != NULL) {
KASSERT(prop_object_type(eaprop) == PROP_TYPE_DATA);
KASSERT(prop_data_size(eaprop) == ETHER_ADDR_LEN);
- memcpy(un->un_eaddr, prop_data_data_nocopy(eaprop),
+ memcpy(un->un_eaddr, prop_data_value(eaprop),
ETHER_ADDR_LEN);
} else {
/* Check if there is already a MAC address in the register */
