diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-08-04 11:58:27 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-08-04 11:58:27 +0000 |
| commit | 99599e2e7cfe5d63c94912318d4352f083034e26 (patch) | |
| tree | da9dcaf5f3e081fb6faa5d3d8e61931f4597270c | |
| parent | 08892126c57932f8182e2081f9b937e9dcf78196 (diff) | |
Remove code that reads the MAC address via the firmware
and then does nothing with it. We already have this
via the EEPROM, which seems to work fine so far.
Slightly tweaked version of a diff from deraadt@
| -rw-r--r-- | sys/dev/ic/acx.c | 20 | ||||
| -rw-r--r-- | sys/dev/ic/acxvar.h | 3 |
2 files changed, 3 insertions, 20 deletions
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c index 22519ae667e..8c9c5060f49 100644 --- a/sys/dev/ic/acx.c +++ b/sys/dev/ic/acx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx.c,v 1.10 2006/08/04 10:47:15 jsg Exp $ */ +/* $OpenBSD: acx.c,v 1.11 2006/08/04 11:58:26 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -641,28 +641,12 @@ acx_config(struct acx_softc *sc) int acx_read_config(struct acx_softc *sc, struct acx_config *conf) { - struct acx_conf_eaddr addr; struct acx_conf_regdom reg_dom; struct acx_conf_antenna ant; struct acx_conf_fwrev fw_rev; uint32_t fw_rev_no; uint8_t sen; - int i, error; - - /* Get station id */ - if (acx_get_eaddr_conf(sc, &addr) != 0) { - printf("%s: can't get station id\n", sc->sc_dev.dv_xname); - return ENXIO; - } - - /* - * Get and print station id in case that EEPROM station id's - * offset is not correct - */ - for (i = 0; i < IEEE80211_ADDR_LEN; ++i) - conf->eaddr[IEEE80211_ADDR_LEN - 1 - i] = addr.eaddr[i]; - printf("%s: MAC address (from firmware): %s\n", - sc->sc_dev.dv_xname, ether_sprintf(conf->eaddr)); + int error; /* Get region domain */ if (acx_get_regdom_conf(sc, ®_dom) != 0) { diff --git a/sys/dev/ic/acxvar.h b/sys/dev/ic/acxvar.h index b10eaffd064..0d97bfbb39d 100644 --- a/sys/dev/ic/acxvar.h +++ b/sys/dev/ic/acxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acxvar.h,v 1.5 2006/08/04 10:47:15 jsg Exp $ */ +/* $OpenBSD: acxvar.h,v 1.6 2006/08/04 11:58:26 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -321,7 +321,6 @@ struct acx_firmware { }; struct acx_config { - uint8_t eaddr[IEEE80211_ADDR_LEN]; uint8_t antenna; uint8_t regdom; uint8_t cca_mode; /* acx100 */ |