svn commit: r191421 - projects/mesh11s/sbin/ifconfig

[Rui Paulo]

Author: rpaulo
Date: Thu Apr 23 12:08:08 2009
New Revision: 191421
URL: http://svn.freebsd.org/changeset/base/191421

Log:
  Print ssid+meshid if verbose is on.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sbin/ifconfig/ifieee80211.c

Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Thu Apr 23 12:05:55 2009	(r191420)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Thu Apr 23 12:08:08 2009	(r191421)
@@ -4012,14 +4012,18 @@ ieee80211_status(int s)
 	gothtconf = 0;
 	gotregdomain = 0;
 
-	if (opmode == IEEE80211_M_MBSS) {
-		printf("\tmeshid ");
+	printf("\t");
+	if (opmode == IEEE80211_M_MBSS || verbose) {
+		printf("meshid ");
 		getid(s, 0, data, sizeof(data), &len, 1);
 		print_string(data, len);
-	} else {
+	}
+	if (verbose)
+		printf(" ");
+	if (opmode != IEEE80211_M_MBSS || verbose) {
 		if (get80211val(s, IEEE80211_IOC_NUMSSIDS, &num) < 0)
 			num = 0;
-		printf("\tssid ");
+		printf("ssid ");
 		if (num > 1) {
 			for (i = 0; i < num; i++) {
 				if (getid(s, i, data, sizeof(data), &len, 0) >= 0 && len > 0) {