svn commit: r195451 - projects/mesh11s/sys/net80211

[Rui Paulo]

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 */