From owner-svn-src-projects@FreeBSD.ORG  Tue Apr 28 17:41:52 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 B912C1065679;
	Tue, 28 Apr 2009 17:41:52 +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 A79678FC1E;
	Tue, 28 Apr 2009 17:41:52 +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 n3SHfqDw055692;
	Tue, 28 Apr 2009 17:41:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3SHfqUW055691;
	Tue, 28 Apr 2009 17:41:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904281741.n3SHfqUW055691@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 28 Apr 2009 17:41:52 +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: r191632 - 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: Tue, 28 Apr 2009 17:41:53 -0000

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 {