From owner-svn-src-projects@FreeBSD.ORG  Sat Mar  7 19:14:00 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 4962C1065672;
	Sat,  7 Mar 2009 19:14:00 +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 37F008FC13;
	Sat,  7 Mar 2009 19:14:00 +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 n27JDxU0060535;
	Sat, 7 Mar 2009 19:13:59 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n27JDxh2060534;
	Sat, 7 Mar 2009 19:13:59 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200903071913.n27JDxh2060534@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 7 Mar 2009 19:13:59 +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: r189495 - 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: Sat, 07 Mar 2009 19:14:00 -0000

Author: rpaulo
Date: Sat Mar  7 19:13:59 2009
New Revision: 189495
URL: http://svn.freebsd.org/changeset/base/189495

Log:
  Sync with the latest Linux numbers from wireless-testing.

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

Modified: projects/mesh11s/sys/net80211/ieee80211.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211.h	Sat Mar  7 19:08:58 2009	(r189494)
+++ projects/mesh11s/sys/net80211/ieee80211.h	Sat Mar  7 19:13:59 2009	(r189495)
@@ -701,9 +701,9 @@ enum {
 	 * XXXRP: new IEs for 11s. Keep them compatible with Linux until
 	 * ANA defines new ones.
 	 */
-	IEEE80211_ELEMID_MESHCONF	= 33,
-	IEEE80211_ELEMID_MESHID		= 34,
-	IEEE80211_ELEMID_MESHLINK	= 35,
+	IEEE80211_ELEMID_MESHCONF	= 51,
+	IEEE80211_ELEMID_MESHID		= 52,
+	IEEE80211_ELEMID_MESHLINK	= 55,
 	IEEE80211_ELEMID_MESHCNGST	= 36,
 	IEEE80211_ELEMID_MESHPEER	= 37,
 	IEEE80211_ELEMID_MESHCSA	= 38,
@@ -718,9 +718,9 @@ enum {
 	IEEE80211_ELEMID_MESHDAOPST	= 47, /* MDAOP Set Teardown */
 	IEEE80211_ELEMID_MESHPANN	= 48,
 	IEEE80211_ELEMID_MESHRANN	= 49,
-	IEEE80211_ELEMID_MESHPREQ	= 50,
-	IEEE80211_ELEMID_MESHPREP	= 51,
-	IEEE80211_ELEMID_MESHPERR	= 52,
+	IEEE80211_ELEMID_MESHPREQ	= 68,
+	IEEE80211_ELEMID_MESHPREP	= 69,
+	IEEE80211_ELEMID_MESHPERR	= 70,
 	IEEE80211_ELEMID_MESHPU		= 53,
 	IEEE80211_ELEMID_MESHPUC	= 54,
 	IEEE80211_ELEMID_MESHSC		= 55,