From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 11:18:06 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 0490010656B1;
	Mon,  8 Jun 2009 11:18:06 +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 E62E18FC08;
	Mon,  8 Jun 2009 11:18:05 +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 n58BI5Md027768;
	Mon, 8 Jun 2009 11:18:05 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58BI5Fs027767;
	Mon, 8 Jun 2009 11:18:05 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081118.n58BI5Fs027767@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 11:18:05 +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: r193706 - 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: Mon, 08 Jun 2009 11:18:07 -0000

Author: rpaulo
Date: Mon Jun  8 11:18:05 2009
New Revision: 193706
URL: http://svn.freebsd.org/changeset/base/193706

Log:
  Introduce different mesh control structures based on the value of the AE
  bit.
  Rename the struct fields to avoid redudancy.
  
  Idea by:	sam
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Mon Jun  8 11:10:55 2009	(r193705)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Mon Jun  8 11:18:05 2009	(r193706)
@@ -338,12 +338,42 @@ enum {
 	/* 2-255 reserved */
 };
 
+/*
+ * Different mesh control structures based on the AE
+ * (Address Extension) bits.
+ *
+ * NB: not __packed because mc_seq isn't uint32_t.
+ */
 struct ieee80211_meshcntl {
-	uint8_t		mc_flags;
-	uint8_t		mc_ttl;
-	uint32_t	mc_seq;
-	/* more mesh addresses follow */
-} __packed;
+	uint8_t		mc_flags;	/* Address Extension 00 */
+	uint8_t		mc_ttl;		/* TTL */
+	uint8_t		mc_seq[4];	/* Sequence No. */
+	/* NB: more addresses may follow */
+};
+
+struct ieee80211_meshcntl_ae01 {
+	uint8_t		mc_flags;	/* Address Extension 01 */
+	uint8_t		mc_ttl;		/* TTL */
+	uint8_t		mc_seq[4];	/* Sequence No. */
+	uint8_t		mc_addr4[IEEE80211_ADDR_LEN];
+};
+
+struct ieee80211_meshcntl_ae10 {
+	uint8_t		mc_flags;	/* Address Extension 10 */
+	uint8_t		mc_ttl;		/* TTL */
+	uint8_t		mc_seq[4];	/* Sequence No. */
+	uint8_t		mc_addr5[IEEE80211_ADDR_LEN];
+	uint8_t		mc_addr6[IEEE80211_ADDR_LEN];
+};
+
+struct ieee80211_meshcntl_ae11 {
+	uint8_t		mc_flags;	/* Address Extension 11 */
+	uint8_t		mc_ttl;		/* TTL */
+	uint8_t		mc_seq[4];	/* Sequence No. */
+	uint8_t		mc_addr4[IEEE80211_ADDR_LEN];
+	uint8_t		mc_addr5[IEEE80211_ADDR_LEN];
+	uint8_t		mc_addr6[IEEE80211_ADDR_LEN];
+};
 
 #ifdef _KERNEL
 void		ieee80211_mesh_attach(struct ieee80211com *);