From owner-svn-src-all@FreeBSD.ORG  Mon Oct 12 14:51:20 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09F93106566B;
	Mon, 12 Oct 2009 14:51:20 +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 D3D468FC17;
	Mon, 12 Oct 2009 14:51:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9CEpJST070289;
	Mon, 12 Oct 2009 14:51:19 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9CEpJb4070288;
	Mon, 12 Oct 2009 14:51:19 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200910121451.n9CEpJb4070288@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 12 Oct 2009 14:51:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197980 - head/sbin/ifconfig
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 14:51:20 -0000

Author: rpaulo
Date: Mon Oct 12 14:51:19 2009
New Revision: 197980
URL: http://svn.freebsd.org/changeset/base/197980

Log:
  Update for latest 802.11s changes in meshconf format.
  
  MFC after:	3 days

Modified:
  head/sbin/ifconfig/ifieee80211.c

Modified: head/sbin/ifconfig/ifieee80211.c
==============================================================================
--- head/sbin/ifconfig/ifieee80211.c	Mon Oct 12 12:54:34 2009	(r197979)
+++ head/sbin/ifconfig/ifieee80211.c	Mon Oct 12 14:51:19 2009	(r197980)
@@ -2624,25 +2624,31 @@ do {									\
 	if (verbose) {
 		const struct ieee80211_meshconf_ie *mconf =
 			(const struct ieee80211_meshconf_ie *)ie;
-		const uint8_t null[4] = IEEE80211_MESHCONF_NULL;
-		const uint8_t hwmp[4] = IEEE80211_MESHCONF_HWMP;
-		const uint8_t airtime[4] = IEEE80211_MESHCONF_AIRTIME;
-		const uint8_t ccsig[4] = IEEE80211_MESHCONF_CCSIG;
-		const uint8_t sae[4] = IEEE80211_MESHCONF_SAE;
-		const uint8_t neighoff[4] = IEEE80211_MESHCONF_SAE;
-		printf("<v%d PATH:", mconf->conf_ver);
-		MATCHOUI(mconf->conf_pselid, hwmp, "HWMP");
+		printf("<PATH:");
+		if (mconf->conf_pselid == IEEE80211_MESHCONF_PATH_HWMP)
+			printf("HWMP");
+		else
+			printf("UNKNOWN");
 		printf(" LINK:");
-		MATCHOUI(mconf->conf_pmetid, airtime, "AIRTIME");
+		if (mconf->conf_pmetid == IEEE80211_MESHCONF_METRIC_AIRTIME)
+			printf("AIRTIME");
+		else
+			printf("UNKNOWN");
 		printf(" CONGESTION:");
-		MATCHOUI(mconf->conf_ccid, ccsig, "SIG");
-		MATCHOUI(mconf->conf_ccid, null, "NULL");
+		if (mconf->conf_ccid == IEEE80211_MESHCONF_CC_DISABLED)
+			printf("DISABLED");
+		else
+			printf("UNKNOWN");
 		printf(" SYNC:");
-		MATCHOUI(mconf->conf_syncid, neighoff, "NEIGHOFF");
-		MATCHOUI(mconf->conf_syncid, null, "NULL");
+		if (mconf->conf_syncid == IEEE80211_MESHCONF_SYNC_NEIGHOFF)
+			printf("NEIGHOFF");
+		else
+			printf("UNKNOWN");
 		printf(" AUTH:");
-		MATCHOUI(mconf->conf_authid, sae, "SAE");
-		MATCHOUI(mconf->conf_authid, null, "NULL");
+		if (mconf->conf_authid == IEEE80211_MESHCONF_AUTH_DISABLED)
+			printf("DISABLED");
+		else
+			printf("UNKNOWN");
 		printf(" FORM:0x%x CAPS:0x%x>", mconf->conf_form,
 		    mconf->conf_cap);
 	}