[src/trunk]: src/sbin/ifconfig - Print 802.11 status (i.e. network ID) after ...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4b0690cb5149
branches:  trunk
changeset: 481228:4b0690cb5149
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jan 25 01:46:57 2000 +0000

description:
- Print 802.11 status (i.e. network ID) after mtu, etc. but before
  protcol addresses.
- When searching for status bits, use the currently selected media type,
  not the currently active media type.

diffstat:

 sbin/ifconfig/ifconfig.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 380d16257d0f -r 4b0690cb5149 sbin/ifconfig/ifconfig.c
--- a/sbin/ifconfig/ifconfig.c  Tue Jan 25 01:17:40 2000 +0000
+++ b/sbin/ifconfig/ifconfig.c  Tue Jan 25 01:46:57 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifconfig.c,v 1.64 2000/01/25 01:03:21 thorpej Exp $    */
+/*     $NetBSD: ifconfig.c,v 1.65 2000/01/25 01:46:57 thorpej Exp $    */
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
 #if 0
 static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
 #else
-__RCSID("$NetBSD: ifconfig.c,v 1.64 2000/01/25 01:03:21 thorpej Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.65 2000/01/25 01:46:57 thorpej Exp $");
 #endif
 #endif /* not lint */
 
@@ -1286,6 +1286,9 @@
        if (mtu)
                printf(" mtu %d", mtu);
        putchar('\n');
+
+       ieee80211_status();
+
        if (ap && alen > 0) {
                printf("\taddress:");
                for (i = 0; i < alen; i++, ap++)
@@ -1335,7 +1338,7 @@
                        for (ifms = ifm_status_descriptions;
                             ifms->ifms_valid != 0; ifms++) {
                                if (ifms->ifms_type !=
-                                     IFM_TYPE(ifmr.ifm_active) &&
+                                     IFM_TYPE(ifmr.ifm_current) &&
                                    ifms->ifms_valid !=
                                      ifm_status_valid_list[bitno])
                                        continue;
@@ -1379,8 +1382,6 @@
        free(media_list);
 
  proto_status:
-       ieee80211_status();
-
        if ((p = afp) != NULL) {
                (*p->af_status)(1);
                if (Aflag & !aflag)