From owner-svn-src-projects@FreeBSD.ORG  Wed Jul  8 13:39:12 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 4744710656C2;
	Wed,  8 Jul 2009 13:39:12 +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 359E38FC0C;
	Wed,  8 Jul 2009 13:39:12 +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 n68DdCOX052608;
	Wed, 8 Jul 2009 13:39:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n68DdCPb052606;
	Wed, 8 Jul 2009 13:39:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200907081339.n68DdCPb052606@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 8 Jul 2009 13:39:12 +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: r195451 - 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: Wed, 08 Jul 2009 13:39:12 -0000

Author: rpaulo
Date: Wed Jul  8 13:39:11 2009
New Revision: 195451
URL: http://svn.freebsd.org/changeset/base/195451

Log:
  Move 11s all to the same place.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_node.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_node.h	Wed Jul  8 13:38:42 2009	(r195450)
+++ projects/mesh11s/sys/net80211/ieee80211_node.h	Wed Jul  8 13:39:11 2009	(r195451)
@@ -178,8 +178,6 @@ struct ieee80211_node {
 	uint16_t		ni_capinfo;	/* capabilities */
 	uint8_t			ni_esslen;
 	uint8_t			ni_essid[IEEE80211_NWID_LEN];
-	uint8_t			ni_meshidlen;
-	uint8_t			ni_meshid[IEEE80211_MESHID_LEN];
 	struct ieee80211_rateset ni_rates;	/* negotiated rate set */
 	struct ieee80211_channel *ni_chan;
 	uint16_t		ni_fhdwell;	/* FH only */
@@ -190,6 +188,8 @@ struct ieee80211_node {
 	uint8_t			ni_dtim_count;	/* DTIM count for last bcn */
 
 	/* 11s state */
+	uint8_t			ni_meshidlen;
+	uint8_t			ni_meshid[IEEE80211_MESHID_LEN];
 	enum ieee80211_mesh_mlstate ni_mlstate;	/* peering management state */
 	uint16_t		ni_mllid;	/* link local ID */
 	uint16_t		ni_mlpid;	/* link peer ID */