diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-02 06:01:45 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-02 06:01:45 +0000 |
| commit | 00d7d81c6323a85b053131cefb9d953464d04111 (patch) | |
| tree | 24d0191d9428c26525bb25fc9fba9fbc789ebd5e /sbin/wicontrol | |
| parent | fc2b97f055ada6fe481c63d51a5299a624ecfb04 (diff) | |
Prism2 firmware should be reported as version a.b.c not a.b variant c.
Only Lucent uses the 'variant' form. Also, prism2 firmware 0.8.2 does
WEP w/o requiring promisc mode (from NetBSD). OK mickey@
Diffstat (limited to 'sbin/wicontrol')
| -rw-r--r-- | sbin/wicontrol/wicontrol.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sbin/wicontrol/wicontrol.c b/sbin/wicontrol/wicontrol.c index 13f7f8766cb..0c4c674e4d0 100644 --- a/sbin/wicontrol/wicontrol.c +++ b/sbin/wicontrol/wicontrol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wicontrol.c,v 1.29 2002/04/01 20:43:08 millert Exp $ */ +/* $OpenBSD: wicontrol.c,v 1.30 2002/04/02 06:01:43 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -69,7 +69,7 @@ static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\ Bill Paul. All rights reserved."; static const char rcsid[] = - "@(#) $OpenBSD: wicontrol.c,v 1.29 2002/04/01 20:43:08 millert Exp $"; + "@(#) $OpenBSD: wicontrol.c,v 1.30 2002/04/02 06:01:43 millert Exp $"; #endif void wi_getval(char *, struct wi_req *); @@ -418,9 +418,14 @@ wi_printcardid(wreq, chip_id) asprintf(&chip_name, "Unknown (%d)", chip_id); break; } - printf("[ %s, Firmware %i.%i variant %i ]", chip_name, - letoh16(wreq->wi_val[2]), letoh16(wreq->wi_val[3]), - letoh16(wreq->wi_val[1])); + if (chip_id <= 5) + printf("[ %s, Firmware %d.%d variant %d ]", chip_name, + letoh16(wreq->wi_val[2]), letoh16(wreq->wi_val[3]), + letoh16(wreq->wi_val[1])); + else + printf("[ %s, Firmware %d.%d.%d ]", chip_name, + letoh16(wreq->wi_val[2]), letoh16(wreq->wi_val[3]), + letoh16(wreq->wi_val[1])); } void |