Use ether_getaddr().

Author: thorpej

sys/arch/mips/adm5120/dev/if_admsw.c

@@ -1,4 +1,4 @@
-/* $NetBSD: if_admsw.c,v 1.31 2024/02/10 09:30:05 andvar Exp $ */
+/* $NetBSD: if_admsw.c,v 1.32 2025/10/15 01:31:27 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.31 2024/02/10 09:30:05 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.32 2025/10/15 01:31:27 thorpej Exp $");
 
 
 #include <sys/param.h>
@@ -323,32 +323,27 @@ admsw_reset(struct admsw_softc *sc)
 static void
 admsw_attach(device_t parent, device_t self, void *aux)
 {
-	uint8_t enaddr[ETHER_ADDR_LEN];
 	struct admsw_softc *sc = device_private(self);
 	struct obio_attach_args *aa = aux;
 	struct ifnet *ifp;
 	bus_dma_segment_t seg;
 	int error, i, rseg;
-	prop_data_t pd;
+	uint8_t enaddr[ETHER_ADDR_LEN];
 
 	printf(": ADM5120 Switch Engine, %d ports\n", SW_DEVS);
 
 	sc->sc_dev = self;
 	sc->sc_dmat = aa->oba_dt;
 	sc->sc_st = aa->oba_st;
 
-	pd = prop_dictionary_get(device_properties(self), "mac-address");
-
-	if (pd == NULL) {
+	if (! ether_getaddr(self, enaddr)) {
 		enaddr[0] = 0x02;
 		enaddr[1] = 0xaa;
 		enaddr[2] = 0xbb;
 		enaddr[3] = 0xcc;
 		enaddr[4] = 0xdd;
 		enaddr[5] = 0xee;
-	} else
-		memcpy(enaddr, prop_data_data_nocopy(pd), sizeof(enaddr));
-
+	}
 	memcpy(sc->sc_enaddr, enaddr, sizeof(sc->sc_enaddr));
 
 	printf("%s: base Ethernet address %s\n", device_xname(sc->sc_dev),

sys/arch/mips/alchemy/dev/if_aumac.c

@@ -1,4 +1,4 @@
-/* $NetBSD: if_aumac.c,v 1.53 2024/06/29 12:11:11 riastradh Exp $ */
+/* $NetBSD: if_aumac.c,v 1.54 2025/10/15 01:32:44 thorpej Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.53 2024/06/29 12:11:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.54 2025/10/15 01:32:44 thorpej Exp $");
 
 
 
@@ -214,8 +214,6 @@ aumac_match(device_t parent, struct cfdata *cf, void *aux)
 static void
 aumac_attach(device_t parent, device_t self, void *aux)
 {
-	const uint8_t *enaddr;
-	prop_data_t ea;
 	struct aumac_softc *sc = device_private(self);
 	struct aubus_attach_args *aa = aux;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@@ -224,6 +222,7 @@ aumac_attach(device_t parent, device_t self, void *aux)
 	paddr_t bufaddr;
 	vaddr_t vbufaddr;
 	int i;
+	uint8_t enaddr[ETHER_ADDR_LEN];
 
 	callout_init(&sc->sc_tick_ch, 0);
 
@@ -234,14 +233,10 @@ aumac_attach(device_t parent, device_t self, void *aux)
 	sc->sc_st = aa->aa_st;
 
 	/* Get the MAC address. */
-	ea = prop_dictionary_get(device_properties(self), "mac-address");
-	if (ea == NULL) {
-		aprint_error_dev(self, "unable to get mac-addr property\n");
+	if (! ether_getaddr(self, enaddr)) {
+		aprint_error_dev(self, "unable to get MAC address\n");
 		return;
 	}
-	KASSERT(prop_object_type(ea) == PROP_TYPE_DATA);
-	KASSERT(prop_data_size(ea) == ETHER_ADDR_LEN);
-	enaddr = prop_data_data_nocopy(ea);
 
 	aprint_normal_dev(self, "Ethernet address %s\n", ether_sprintf(enaddr));