summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormglocker <mglocker@openbsd.org>2006-08-07 00:23:20 +0000
committermglocker <mglocker@openbsd.org>2006-08-07 00:23:20 +0000
commit35f4d1841aea8622a4318ac1be9d5396723299d3 (patch)
tree2b751026eec0b1248c029ce6a949470a925f8b4d
parentDo not take shortcuts when the PLT size is 0; makes emacs work again on alpha. (diff)
downloadwireguard-openbsd-35f4d1841aea8622a4318ac1be9d5396723299d3.tar.xz
wireguard-openbsd-35f4d1841aea8622a4318ac1be9d5396723299d3.zip
Radio type is in hex not decimal. Therefore decide correctly which
radio firmware to load. Spotted by Marc Winiger <mw@msys.ch>
-rw-r--r--sys/dev/ic/acx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index c4ba9af9b8a..067ae373c15 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acx.c,v 1.28 2006/08/06 14:23:05 damien Exp $ */
+/* $OpenBSD: acx.c,v 1.29 2006/08/07 00:23:20 mglocker Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -278,7 +278,7 @@ acx_attach(struct acx_softc *sc)
return (ENXIO);
#undef EEINFO_RETRY_MAX
- printf(", radio %02x", sc->sc_radio_type);
+ printf(", radio 0x%02x", sc->sc_radio_type);
#ifdef DUMP_EEPROM
for (i = 0; i < 0x40; ++i) {
@@ -445,8 +445,8 @@ acx_init(struct ifnet *ifp)
/* ACX111 firmware is combined */
if (!(sc->sc_flags & ACX_FLAG_ACX111)) {
- error = acx_load_radio_firmware(sc, (sc->sc_radio_type == 11) ?
- "tiacx100r11" : "tiacx100r0D");
+ error = acx_load_radio_firmware(sc,
+ sc->sc_radio_type == 0x11 ? "tiacx100r11" : "tiacx100r0D");
if (error)
goto back;
}