From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 23 12:08:15 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D572A106592D;
	Thu, 23 Apr 2009 12:08:15 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DFDEC8FC17;
	Thu, 23 Apr 2009 12:08:08 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3NC88do086707;
	Thu, 23 Apr 2009 12:08:08 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3NC88Eg086706;
	Thu, 23 Apr 2009 12:08:08 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904231208.n3NC88Eg086706@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 23 Apr 2009 12:08:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191421 - projects/mesh11s/sbin/ifconfig
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Apr 2009 12:08:32 -0000

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) {