From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 21:20:25 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 22034106564A;
	Thu, 16 Apr 2009 21:20:25 +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 0F9E28FC1F;
	Thu, 16 Apr 2009 21:20:25 +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 n3GLKOGc092065;
	Thu, 16 Apr 2009 21:20:24 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3GLKOfl092064;
	Thu, 16 Apr 2009 21:20:24 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904162120.n3GLKOfl092064@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 16 Apr 2009 21:20:24 +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: r191149 - projects/mesh11s/sys/net80211
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, 16 Apr 2009 21:20:25 -0000

Author: rpaulo
Date: Thu Apr 16 21:20:24 2009
New Revision: 191149
URL: http://svn.freebsd.org/changeset/base/191149

Log:
  Add more defines related to mesh configuration elem. id.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211.h

Modified: projects/mesh11s/sys/net80211/ieee80211.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211.h	Thu Apr 16 20:30:28 2009	(r191148)
+++ projects/mesh11s/sys/net80211/ieee80211.h	Thu Apr 16 21:20:24 2009	(r191149)
@@ -786,10 +786,21 @@ struct ieee80211_meshconf_ie {
 	uint32_t	conf_apspi;	/* Active Path Sel. Proto. ID */
 	uint32_t	conf_apsmi;	/* APS Metric Identifier */
 	uint32_t	conf_ccmi;	/* Congestion Control Mode ID  */
-	uint8_t		conf_meshinfo;
-	uint8_t		conf_meshcap;
+	uint8_t		conf_finfo;	/* Formation Information */
+	uint8_t		conf_cap;
 } __packed;
 
+#define	IEEE80211_MESHCONF_APSPI_HWMP_OUI	0x000fac
+#define	IEEE80211_MESHCONF_APSPI_HWMP_VALUE	0xff	/* XXX Linux */
+#define	IEEE80211_MESHCONF_APSMI_AIRTIME_OUI	0x000fac
+#define	IEEE80211_MESHCONF_APSMI_AIRTIME_VALUE	0xff	/* XXX Linux */
+#define	IEEE80211_MESHCONF_CCMI_DEFAULT_OUI	0x000fac
+#define	IEEE80211_MESHCONF_CCMI_DEFAULT_VALUE	0xff	/* XXX Linux */
+#define	IEEE80211_MESHCONF_CCMI_NULL_OUI	0x000fac
+#define	IEEE80211_MESHCONF_CCMI_NULL_VALUE	255
+#define	IEEE80211_MESHCONF_FORM_MP		(1 << 1) /* connected to portal */
+#define	IEEE80211_MESHCONF_FORM_NEIGH		(1 << 4) /* no of neighbours */
+
 /* Mesh Identifier */
 struct ieee80211_meshid_ie {
 	uint8_t		id_ie;		/* IEEE80211_ELEMID_MESHID */
@@ -797,7 +808,7 @@ struct ieee80211_meshid_ie {
 } __packed;
 
 #define	IEEE80211_MESHID_MAX_SIZE \
-	(sizeof(struct ieee80211_meshid_ie) + 32)
+	(sizeof(struct ieee80211_meshid_ie) + IEEE80211_NWID_LEN)
 
 /* Link Metric Report */
 struct ieee80211_meshlink_ie {