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

[Rui Paulo]

Author: rpaulo
Date: Fri Jun 26 19:12:49 2009
New Revision: 195072
URL: http://svn.freebsd.org/changeset/base/195072

Log:
  Simplify printing of meshid and ssid.
  
  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	Fri Jun 26 19:04:08 2009	(r195071)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Fri Jun 26 19:12:49 2009	(r195072)
@@ -4217,14 +4217,12 @@ ieee80211_status(int s)
 	gotregdomain = 0;
 
 	printf("\t");
-	if (opmode == IEEE80211_M_MBSS || verbose) {
+	if (opmode == IEEE80211_M_MBSS) {
 		printf("meshid ");
 		getid(s, 0, data, sizeof(data), &len, 1);
 		print_string(data, len);
-	}
-	if (verbose)
 		printf(" ");
-	if (opmode != IEEE80211_M_MBSS || verbose) {
+	} else {
 		if (get80211val(s, IEEE80211_IOC_NUMSSIDS, &num) < 0)
 			num = 0;
 		printf("ssid ");
@@ -4238,7 +4236,6 @@ ieee80211_status(int s)
 		} else
 			print_string(data, len);
 	}
-
 	c = getcurchan(s);
 	if (c->ic_freq != IEEE80211_CHAN_ANY) {
 		char buf[14];