From f9e1815aafe22ff2d9eda993a335166914297943 Mon Sep 17 00:00:00 2001
From: martin <martin@NetBSD.org>
Date: Fri, 22 Jan 2010 08:56:04 +0000
Subject: [PATCH] Unify the name of the device property to hold a MAC address -
 there was no clear majority for either "mac-addr" vs. "mac-address", but a
 quick gallup poll among developers selected the latter.

---
 sys/arch/algor/algor/autoconf.c                | 6 +++---
 sys/arch/arm/at91/at91emac.c                   | 8 ++++----
 sys/arch/arm/ep93xx/epe.c                      | 6 +++---
 sys/arch/evbarm/armadillo/armadillo9_machdep.c | 6 +++---
 sys/arch/evbarm/mpcsa/mpcsa_machdep.c          | 8 ++++----
 sys/arch/evbmips/adm5120/autoconf.c            | 8 ++++----
 sys/arch/evbmips/adm5120/machdep.c             | 6 +++---
 sys/arch/evbmips/alchemy/autoconf.c            | 6 +++---
 sys/arch/iyonix/iyonix/autoconf.c              | 6 +++---
 sys/arch/mips/adm5120/dev/if_admsw.c           | 6 +++---
 sys/arch/mips/alchemy/dev/if_aumac.c           | 6 +++---
 sys/arch/mips/atheros/ar5312.c                 | 6 +++---
 sys/arch/mips/atheros/ar5315.c                 | 8 ++++----
 sys/arch/mips/atheros/dev/if_ae.c              | 6 +++---
 sys/arch/powerpc/ibm4xx/dev/if_emac.c          | 6 +++---
 sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c      | 6 +++---
 sys/dev/pci/if_wm.c                            | 6 +++---
 17 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/sys/arch/algor/algor/autoconf.c b/sys/arch/algor/algor/autoconf.c
index 5cb55068b433..050c962c7194 100644
--- a/sys/arch/algor/algor/autoconf.c
+++ b/sys/arch/algor/algor/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.17 2008/04/28 20:23:10 martin Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.18 2010/01/22 08:56:04 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2010/01/22 08:56:04 martin Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
@@ -115,7 +115,7 @@ device_register(struct device *dev, void *aux)
 			    algor_ethaddr, ETHER_ADDR_LEN);
 			KASSERT(pd != NULL);
 			if (prop_dictionary_set(device_properties(dev),
-						"mac-addr", pd) == false) {
+						"mac-address", pd) == false) {
 				printf("WARNING: unable to set mac-addr "
 				    "property for %s\n", dev->dv_xname);
 			}
diff --git a/sys/arch/arm/at91/at91emac.c b/sys/arch/arm/at91/at91emac.c
index 9b724e0aee35..ec9c8bdb4d84 100644
--- a/sys/arch/arm/at91/at91emac.c
+++ b/sys/arch/arm/at91/at91emac.c
@@ -1,5 +1,5 @@
-/*	$Id: at91emac.c,v 1.7 2010/01/19 22:06:19 pooka Exp $	*/
-/*	$NetBSD: at91emac.c,v 1.7 2010/01/19 22:06:19 pooka Exp $	*/
+/*	$Id: at91emac.c,v 1.8 2010/01/22 08:56:04 martin Exp $	*/
+/*	$NetBSD: at91emac.c,v 1.8 2010/01/22 08:56:04 martin Exp $	*/
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.7 2010/01/19 22:06:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.8 2010/01/22 08:56:04 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -171,7 +171,7 @@ emac_attach(device_t parent, device_t self, void *aux)
 	EMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR|ETH_RSR_REC|ETH_RSR_BNA)));
 
 	/* Fetch the Ethernet address from property if set. */
-	enaddr = prop_dictionary_get(device_properties(self), "mac-addr");
+	enaddr = prop_dictionary_get(device_properties(self), "mac-address");
 
 	if (enaddr != NULL) {
 		KASSERT(prop_object_type(enaddr) == PROP_TYPE_DATA);
diff --git a/sys/arch/arm/ep93xx/epe.c b/sys/arch/arm/ep93xx/epe.c
index 8cab6ce5bb4e..c1f330f6d1d4 100644
--- a/sys/arch/arm/ep93xx/epe.c
+++ b/sys/arch/arm/ep93xx/epe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: epe.c,v 1.23 2010/01/19 22:06:19 pooka Exp $	*/
+/*	$NetBSD: epe.c,v 1.24 2010/01/22 08:56:04 martin Exp $	*/
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.23 2010/01/19 22:06:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.24 2010/01/22 08:56:04 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -143,7 +143,7 @@ epe_attach(struct device *parent, struct device *self, void *aux)
 		panic("%s: Cannot map registers", self->dv_xname);
 
 	/* Fetch the Ethernet address from property if set. */
-	enaddr = prop_dictionary_get(device_properties(self), "mac-addr");
+	enaddr = prop_dictionary_get(device_properties(self), "mac-address");
 	if (enaddr != NULL) {
 		KASSERT(prop_object_type(enaddr) == PROP_TYPE_DATA);
 		KASSERT(prop_data_size(enaddr) == ETHER_ADDR_LEN);
diff --git a/sys/arch/evbarm/armadillo/armadillo9_machdep.c b/sys/arch/evbarm/armadillo/armadillo9_machdep.c
index e2517730510e..a5382faafefd 100644
--- a/sys/arch/evbarm/armadillo/armadillo9_machdep.c
+++ b/sys/arch/evbarm/armadillo/armadillo9_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: armadillo9_machdep.c,v 1.18 2009/12/26 16:01:23 uebayasi Exp $	*/
+/*	$NetBSD: armadillo9_machdep.c,v 1.19 2010/01/22 08:56:04 martin Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.18 2009/12/26 16:01:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.19 2010/01/22 08:56:04 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -315,7 +315,7 @@ armadillo9_device_register(device_t dev, void *aux)
 		    armadillo9_ethaddr, ETHER_ADDR_LEN);
 		KASSERT(pd != NULL);
 		if (prop_dictionary_set(device_properties(dev),
-					"mac-addr", pd) == false) {
+					"mac-address", pd) == false) {
 			printf("WARNING: unable to set mac-addr property "
 			    "for %s\n", dev->dv_xname);
 		}
diff --git a/sys/arch/evbarm/mpcsa/mpcsa_machdep.c b/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
index ff235b922ca1..0e69dd9bf59e 100644
--- a/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
+++ b/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
@@ -1,5 +1,5 @@
-/*	$Id: mpcsa_machdep.c,v 1.3 2008/11/11 06:46:41 dyoung Exp $	*/
-/*	$NetBSD: mpcsa_machdep.c,v 1.3 2008/11/11 06:46:41 dyoung Exp $	*/
+/*	$Id: mpcsa_machdep.c,v 1.4 2010/01/22 08:56:05 martin Exp $	*/
+/*	$NetBSD: mpcsa_machdep.c,v 1.4 2010/01/22 08:56:05 martin Exp $	*/
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.3 2008/11/11 06:46:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.4 2010/01/22 08:56:05 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -383,7 +383,7 @@ static void mpcsa_device_register(device_t dev, void *aux)
 				eth_addr, ETHER_ADDR_LEN);
 			KASSERT(pd != NULL);
 			if (prop_dictionary_set(device_properties(dev),
-						"mac-addr", pd) == FALSE) {
+						"mac-address", pd) == FALSE) {
 				printf("WARNING: unable to set mac-addr property "
 				       "for %s\n", dev->dv_xname);
 			}
diff --git a/sys/arch/evbmips/adm5120/autoconf.c b/sys/arch/evbmips/adm5120/autoconf.c
index 4b368b8037c8..c892af759147 100644
--- a/sys/arch/evbmips/adm5120/autoconf.c
+++ b/sys/arch/evbmips/adm5120/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.3 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: autoconf.c,v 1.4 2010/01/22 08:56:05 martin Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2010/01/22 08:56:05 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -113,10 +113,10 @@ device_register(struct device *dev, void *aux)
 		prop_object_release(po);
 	}
 	if (device_is_a(dev, "admsw") &&
-	    (po = prop_dictionary_get(properties, "mac-addr")) != NULL) {
+	    (po = prop_dictionary_get(properties, "mac-address")) != NULL) {
 
 		if (prop_dictionary_set(device_properties(dev),
-					"mac-addr", po) == FALSE) {
+					"mac-address", po) == FALSE) {
 			printf("WARNING: unable to set mac-addr "
 			    "property for %s\n", dev->dv_xname);
 		}
diff --git a/sys/arch/evbmips/adm5120/machdep.c b/sys/arch/evbmips/adm5120/machdep.c
index 485927c0df09..249b196a6589 100644
--- a/sys/arch/evbmips/adm5120/machdep.c
+++ b/sys/arch/evbmips/adm5120/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.14 2009/12/14 00:46:00 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.15 2010/01/22 08:56:05 martin Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -107,7 +107,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2009/12/14 00:46:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2010/01/22 08:56:05 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -290,7 +290,7 @@ parse_args(prop_dictionary_t properties, int argc, char **argv,
 				printf("%s: prop_data_create_data\n", __func__);
 				continue;
 			}
-			if (!prop_dictionary_set(properties, "mac-addr", pd)) {
+			if (!prop_dictionary_set(properties, "mac-address", pd)) {
 				printf("%s: prop_dictionary_set(mac)\n",
 				    __func__);
 			}
diff --git a/sys/arch/evbmips/alchemy/autoconf.c b/sys/arch/evbmips/alchemy/autoconf.c
index 8fd5237d926d..379d9d5b3bca 100644
--- a/sys/arch/evbmips/alchemy/autoconf.c
+++ b/sys/arch/evbmips/alchemy/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.16 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: autoconf.c,v 1.17 2010/01/22 08:56:05 martin Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2010/01/22 08:56:05 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -119,7 +119,7 @@ device_register(struct device *dev, void *aux)
 			pd = prop_data_create_data(ethaddr, ETHER_ADDR_LEN);
 			KASSERT(pd != NULL);
 			if (prop_dictionary_set(device_properties(dev),
-						"mac-addr", pd) == false) {
+						"mac-address", pd) == false) {
 				printf("WARNING: unable to set mac-addr "
 				    "property for %s\n", dev->dv_xname);
 			}
diff --git a/sys/arch/iyonix/iyonix/autoconf.c b/sys/arch/iyonix/iyonix/autoconf.c
index 6b452d308fc7..8d825fd6ee53 100644
--- a/sys/arch/iyonix/iyonix/autoconf.c
+++ b/sys/arch/iyonix/iyonix/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.11 2009/08/02 11:32:05 gavan Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.12 2010/01/22 08:56:05 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2009/08/02 11:32:05 gavan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.12 2010/01/22 08:56:05 martin Exp $");
 
 #include "opt_md.h"
 
@@ -134,7 +134,7 @@ device_register(struct device *dev, void *aux)
 							   ETHER_ADDR_LEN);
 			KASSERT(mac != NULL);
 
-			SETPROP("mac-addr", mac);
+			SETPROP("mac-address", mac);
 			SETPROP("i82543-cfg1", cfg1);
 			SETPROP("i82543-cfg2", cfg2);
 			SETPROP("i82543-swdpin", swdpin);
diff --git a/sys/arch/mips/adm5120/dev/if_admsw.c b/sys/arch/mips/adm5120/dev/if_admsw.c
index 0229dedd9ed5..ae415384fdc1 100644
--- a/sys/arch/mips/adm5120/dev/if_admsw.c
+++ b/sys/arch/mips/adm5120/dev/if_admsw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admsw.c,v 1.6 2010/01/19 22:06:21 pooka Exp $ */
+/* $NetBSD: if_admsw.c,v 1.7 2010/01/22 08:56:05 martin 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.6 2010/01/19 22:06:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.7 2010/01/22 08:56:05 martin Exp $");
 
 
 #include <sys/param.h>
@@ -341,7 +341,7 @@ admsw_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_dmat = aa->oba_dt;
 	sc->sc_st = aa->oba_st;
 
-	pd = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-addr");
+	pd = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-address");
 
 	if (pd == NULL) {
 		enaddr[0] = 0x02;
diff --git a/sys/arch/mips/alchemy/dev/if_aumac.c b/sys/arch/mips/alchemy/dev/if_aumac.c
index 7fb7ee77b696..9a70d9e198eb 100644
--- a/sys/arch/mips/alchemy/dev/if_aumac.c
+++ b/sys/arch/mips/alchemy/dev/if_aumac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aumac.c,v 1.26 2010/01/19 22:06:21 pooka Exp $ */
+/* $NetBSD: if_aumac.c,v 1.27 2010/01/22 08:56:05 martin Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.26 2010/01/19 22:06:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.27 2010/01/22 08:56:05 martin Exp $");
 
 #include "rnd.h"
 
@@ -238,7 +238,7 @@ aumac_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_st = aa->aa_st;
 
 	/* Get the MAC address. */
-	ea = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-addr");
+	ea = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-address");
 	if (ea == NULL) {
 		printf("%s: unable to get mac-addr property\n",
 		    sc->sc_dev.dv_xname);
diff --git a/sys/arch/mips/atheros/ar5312.c b/sys/arch/mips/atheros/ar5312.c
index cd04d38c6bf1..e4160c6f3435 100644
--- a/sys/arch/mips/atheros/ar5312.c
+++ b/sys/arch/mips/atheros/ar5312.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ar5312.c,v 1.5 2008/01/23 05:23:59 dyoung Exp $ */
+/* $NetBSD: ar5312.c,v 1.6 2010/01/22 08:56:05 martin Exp $ */
 
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -264,7 +264,7 @@ ar531x_device_register(struct device *dev, void *aux)
 		else
 			return;
 
-		addprop_data(dev, "mac-addr", enet, ETHER_ADDR_LEN);
+		addprop_data(dev, "mac-address", enet, ETHER_ADDR_LEN);
 	}
 
 	if (device_is_a(dev, "ath")) {
@@ -277,7 +277,7 @@ ar531x_device_register(struct device *dev, void *aux)
 		else
 			return;
 
-		addprop_data(dev, "mac-addr", enet, ETHER_ADDR_LEN);
+		addprop_data(dev, "mac-address", enet, ETHER_ADDR_LEN);
 
 		addprop_integer(dev, "wmac-rev",
 		    AR5312_REVISION_WMAC(GETSYSREG(AR5312_SYSREG_REVISION)));
diff --git a/sys/arch/mips/atheros/ar5315.c b/sys/arch/mips/atheros/ar5315.c
index 08352826836d..fbf97f0863cd 100644
--- a/sys/arch/mips/atheros/ar5315.c
+++ b/sys/arch/mips/atheros/ar5315.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ar5315.c,v 1.6 2009/07/06 00:43:22 alc Exp $ */
+/* $NetBSD: ar5315.c,v 1.7 2010/01/22 08:56:05 martin Exp $ */
 
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -48,7 +48,7 @@
  * family.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5315.c,v 1.6 2009/07/06 00:43:22 alc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5315.c,v 1.7 2010/01/22 08:56:05 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -294,7 +294,7 @@ ar531x_device_register(struct device *dev, void *aux)
 		else
 			return;
 
-		addprop_data(dev, "mac-addr", enet, ETHER_ADDR_LEN);
+		addprop_data(dev, "mac-address", enet, ETHER_ADDR_LEN);
 	}
 
 	if (device_is_a(dev, "ath")) {
@@ -305,7 +305,7 @@ ar531x_device_register(struct device *dev, void *aux)
 		else
 			return;
 
-		addprop_data(dev, "mac-addr", enet, ETHER_ADDR_LEN);
+		addprop_data(dev, "mac-address", enet, ETHER_ADDR_LEN);
 
 		addprop_integer(dev, "wmac-rev",
 		    GETSYSREG(AR5315_SYSREG_SREV));
diff --git a/sys/arch/mips/atheros/dev/if_ae.c b/sys/arch/mips/atheros/dev/if_ae.c
index d69bacc7a350..ef868fe90d84 100644
--- a/sys/arch/mips/atheros/dev/if_ae.c
+++ b/sys/arch/mips/atheros/dev/if_ae.c
@@ -1,4 +1,4 @@
-/* $Id: if_ae.c,v 1.17 2010/01/19 22:06:21 pooka Exp $ */
+/* $Id: if_ae.c,v 1.18 2010/01/22 08:56:05 martin Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.17 2010/01/19 22:06:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.18 2010/01/22 08:56:05 martin Exp $");
 
 
 #include <sys/param.h>
@@ -235,7 +235,7 @@ ae_attach(device_t parent, device_t self, void *aux)
 	/*
 	 * Try to get MAC address.
 	 */
-	ea = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-addr");
+	ea = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-address");
 	if (ea == NULL) {
 		printf("%s: unable to get mac-addr property\n",
 		    sc->sc_dev.dv_xname);
diff --git a/sys/arch/powerpc/ibm4xx/dev/if_emac.c b/sys/arch/powerpc/ibm4xx/dev/if_emac.c
index 5090ecd3bd67..bdb3d50b1bd0 100644
--- a/sys/arch/powerpc/ibm4xx/dev/if_emac.c
+++ b/sys/arch/powerpc/ibm4xx/dev/if_emac.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_emac.c,v 1.34 2010/01/19 22:06:22 pooka Exp $	*/
+/*	$NetBSD: if_emac.c,v 1.35 2010/01/22 08:56:05 martin Exp $	*/
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.34 2010/01/19 22:06:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.35 2010/01/22 08:56:05 martin Exp $");
 
 
 #include <sys/param.h>
@@ -395,7 +395,7 @@ emac_attach(struct device *parent, struct device *self, void *aux)
 	emac_reset(sc);
 
 	/* Fetch the Ethernet address. */
-	ea = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-addr");
+	ea = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-address");
 	if (ea == NULL) {
 		printf("%s: unable to get mac-addr property\n",
 		    sc->sc_dev.dv_xname);
diff --git a/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c b/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c
index c5021feabc47..bf91af8cffa2 100644
--- a/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c
+++ b/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibm4xx_autoconf.c,v 1.11 2007/02/22 16:57:56 thorpej Exp $	*/
+/*	$NetBSD: ibm4xx_autoconf.c,v 1.12 2010/01/22 08:56:06 martin Exp $	*/
 /*	Original Tag: ibm4xxgpx_autoconf.c,v 1.2 2004/10/23 17:12:22 thorpej Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_autoconf.c,v 1.11 2007/02/22 16:57:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_autoconf.c,v 1.12 2010/01/22 08:56:06 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -70,7 +70,7 @@ ibm4xx_device_register(struct device *dev, void *aux)
 				return;
 			}
 			if (prop_dictionary_set(device_properties(dev),
-						"mac-addr", pd) == false) {
+						"mac-address", pd) == false) {
 				printf("WARNING: unable to set mac-addr "
 				    "property for %s\n", dev->dv_xname);
 			}
diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index 6ff4877d3c1a..691a1dbacb53 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.194 2010/01/21 08:52:20 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.195 2010/01/22 08:56:06 martin Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.194 2010/01/21 08:52:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.195 2010/01/22 08:56:06 martin Exp $");
 
 #include "rnd.h"
 
@@ -1452,7 +1452,7 @@ wm_attach(device_t parent, device_t self, void *aux)
 	 * Read the Ethernet address from the EEPROM, if not first found
 	 * in device properties.
 	 */
-	ea = prop_dictionary_get(dict, "mac-addr");
+	ea = prop_dictionary_get(dict, "mac-address");
 	if (ea != NULL) {
 		KASSERT(prop_object_type(ea) == PROP_TYPE_DATA);
 		KASSERT(prop_data_size(ea) == ETHER_ADDR_LEN);