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

[Rui Paulo]

Author: rpaulo
Date: Tue Apr 28 17:41:52 2009
New Revision: 191632
URL: http://svn.freebsd.org/changeset/base/191632

Log:
  Sync with draft.
  
  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	Tue Apr 28 17:41:18 2009	(r191631)
+++ projects/mesh11s/sys/net80211/ieee80211.h	Tue Apr 28 17:41:52 2009	(r191632)
@@ -710,8 +710,6 @@ enum {
 	IEEE80211_ELEMID_MESHTIM	= 39,
 	IEEE80211_ELEMID_MESHAWAKEW	= 40,
 	IEEE80211_ELEMID_MESHBEACONT	= 41,
-	IEEE80211_ELEMID_MESHTIMINGINFO	= 42,
-	IEEE80211_ELEMID_MESHSYNCPROTO	= 43,
 	IEEE80211_ELEMID_MESHDAOPSREQ	= 44, /* MDAOP Setup Request */
 	IEEE80211_ELEMID_MESHDAOPSREPLY = 45, /* MDAOP Setup Request */
 	IEEE80211_ELEMID_MESHDAOPADV	= 46, /* MDAOP Advertisements */
@@ -723,9 +721,8 @@ enum {
 	IEEE80211_ELEMID_MESHPERR	= 70,
 	IEEE80211_ELEMID_MESHPU		= 53,
 	IEEE80211_ELEMID_MESHPUC	= 54,
-	IEEE80211_ELEMID_MESHSC		= 55,
-	IEEE80211_ELEMID_MESHSA		= 56,
-	IEEE80211_ELEMID_MESHACT	= 57, /* Anti-Clogging Token */
+	IEEE80211_ELEMID_MESHAH		= 60, /* Abbreviated Handshake */
+	IEEE80211_ELEMID_MESHPPV	= 61, /* Peering Protocol Version */
 };
 
 struct ieee80211_tim_ie {