summaryrefslogtreecommitdiff
path: root/sys/dev/ic/if_wi.c
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2005-07-12 17:23:20 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2005-07-12 17:23:20 +0000
commit87b3e9995ea8502ae53c5a45ed1f1082a833e772 (patch)
tree4bfdce1176a89b10059d71643f64b92c23303bf5 /sys/dev/ic/if_wi.c
parent7bf05c8a93b0826ffa34984271c26b1d947a9515 (diff)
Print the card number the chipset string is obtained from.
As this is not a 1 to 1 mapping it can be useful to know this number, in particular if you have a broken device and want to upgrade the firmware. Prodded by jolan@, ok deraadt@
Diffstat (limited to 'sys/dev/ic/if_wi.c')
-rw-r--r--sys/dev/ic/if_wi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index aad838b6fe5..64dc2703816 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.117 2005/04/03 08:07:00 uwe Exp $ */
+/* $OpenBSD: if_wi.c,v 1.118 2005/07/12 17:23:19 jsg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -127,7 +127,7 @@ u_int32_t widebug = WIDEBUG;
#if !defined(lint) && !defined(__OpenBSD__)
static const char rcsid[] =
- "$OpenBSD: if_wi.c,v 1.117 2005/04/03 08:07:00 uwe Exp $";
+ "$OpenBSD: if_wi.c,v 1.118 2005/07/12 17:23:19 jsg Exp $";
#endif /* lint */
#ifdef foo
@@ -2566,11 +2566,11 @@ wi_get_id(sc)
printf("%s: Firmware %d.%02d variant %d, ", WI_PRT_ARG(sc),
ver.wi_ver[2], ver.wi_ver[3], ver.wi_ver[1]);
} else {
- printf("%s: %s%s, Firmware %d.%d.%d (primary), %d.%d.%d (station), ",
+ printf("%s: %s%s (0x%04x), Firmware %d.%d.%d (primary), %d.%d.%d (station), ",
WI_PRT_ARG(sc),
sc->sc_firmware_type == WI_SYMBOL ? "Symbol " : "",
- card_name, pri_fw_ver[0], pri_fw_ver[1], pri_fw_ver[2],
- sc->sc_sta_firmware_ver / 10000,
+ card_name, card_id, pri_fw_ver[0], pri_fw_ver[1],
+ pri_fw_ver[2], sc->sc_sta_firmware_ver / 10000,
(sc->sc_sta_firmware_ver % 10000) / 100,
sc->sc_sta_firmware_ver % 100);
}