From b7b6c9e6fac9c6f1a87d0f27f0c8e57e4b1e8964 Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Sat, 14 Aug 2004 21:43:37 +0000 Subject: - Make OF_getetheraddr() honour the "local-mac-address?" system config variable. If set to "true" OF_getetheraddr() will now return the unique MAC address stored in the "local-mac-address" property of the device's OFW node if present and the host address/system default MAC address if the node doesn't doesn't have such a property. If set to "false" the host address will be returned for all devices like before this change. This brings the behaviour of device drivers for NICs with OFW support/ FCode, i.e. dc(4) for on-board DM9102A on Sun machines, gem(4) and hme(4), regarding "local-mac-address?" in line with NetBSD and Solaris. The man pages of the respective drivers will be updated separately to reflect this change. - Remove OF_getetheraddr2() which was used as a stopgap in dc(4). Its functionality is now part of OF_getetheraddr(). --- sys/dev/dc/if_dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/dev/dc') diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index cc550fa100ed..4476f2e51870 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -2063,7 +2063,7 @@ dc_attach(device_t dev) for (i = 0; i < ETHER_ADDR_LEN; i++) if (eaddr[i] != 0x00) break; - if (i >= ETHER_ADDR_LEN && OF_getetheraddr2(dev, eaddr) == -1) + if (i >= ETHER_ADDR_LEN) OF_getetheraddr(dev, eaddr); #endif break; -- cgit v1.3