From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 26 11:58:15 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 DA64B106566C;
	Fri, 26 Jun 2009 11:58:15 +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 C91E08FC0A;
	Fri, 26 Jun 2009 11:58:15 +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 n5QBwF7B085822;
	Fri, 26 Jun 2009 11:58:15 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5QBwFiC085820;
	Fri, 26 Jun 2009 11:58:15 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906261158.n5QBwFiC085820@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 26 Jun 2009 11:58:15 +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: r195052 - 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: Fri, 26 Jun 2009 11:58:16 -0000

Author: rpaulo
Date: Fri Jun 26 11:58:15 2009
New Revision: 195052
URL: http://svn.freebsd.org/changeset/base/195052

Log:
  Remove MCCA stuff.
  Rename Peering Protocol IE.
  
  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	Fri Jun 26 11:56:47 2009	(r195051)
+++ projects/mesh11s/sys/net80211/ieee80211.h	Fri Jun 26 11:58:15 2009	(r195052)
@@ -719,10 +719,6 @@ enum {
 	IEEE80211_ELEMID_MESHTIM	= 39,
 	IEEE80211_ELEMID_MESHAWAKEW	= 40,
 	IEEE80211_ELEMID_MESHBEACONT	= 41,
-	IEEE80211_ELEMID_MESHDAOPSREQ	= 44, /* MDAOP Setup Request */
-	IEEE80211_ELEMID_MESHDAOPSREPLY = 45, /* MDAOP Setup Request */
-	IEEE80211_ELEMID_MESHDAOPADV	= 46, /* MDAOP Advertisements */
-	IEEE80211_ELEMID_MESHDAOPST	= 47, /* MDAOP Set Teardown */
 	IEEE80211_ELEMID_MESHPANN	= 48,
 	IEEE80211_ELEMID_MESHRANN	= 49,
 	IEEE80211_ELEMID_MESHPREQ	= 68,
@@ -731,7 +727,7 @@ enum {
 	IEEE80211_ELEMID_MESHPU		= 53,
 	IEEE80211_ELEMID_MESHPUC	= 54,
 	IEEE80211_ELEMID_MESHAH		= 60, /* Abbreviated Handshake */
-	IEEE80211_ELEMID_MESHPPV	= 61, /* Peering Protocol Version */
+	IEEE80211_ELEMID_MESHPEERV	= 61, /* Peering Protocol Version */
 };
 
 struct ieee80211_tim_ie {