From owner-svn-src-projects@FreeBSD.ORG  Mon Apr 20 17:39:44 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 E4F01106566B;
	Mon, 20 Apr 2009 17:39:44 +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 D4C908FC1E;
	Mon, 20 Apr 2009 17:39:44 +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 n3KHdiQ2053503;
	Mon, 20 Apr 2009 17:39:44 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KHdiQi053502;
	Mon, 20 Apr 2009 17:39:44 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904201739.n3KHdiQi053502@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 20 Apr 2009 17:39:44 +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: r191329 - 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: Mon, 20 Apr 2009 17:39:45 -0000

Author: rpaulo
Date: Mon Apr 20 17:39:44 2009
New Revision: 191329
URL: http://svn.freebsd.org/changeset/base/191329

Log:
  Add mesh names and call mesh attach/detach routines.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_proto.c

Modified: projects/mesh11s/sys/net80211/ieee80211_proto.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_proto.c	Mon Apr 20 17:11:21 2009	(r191328)
+++ projects/mesh11s/sys/net80211/ieee80211_proto.c	Mon Apr 20 17:39:44 2009	(r191329)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <net80211/ieee80211_sta.h>
 #include <net80211/ieee80211_hostap.h>
 #include <net80211/ieee80211_wds.h>
+#include <net80211/ieee80211_mesh.h>
 #include <net80211/ieee80211_monitor.h>
 #include <net80211/ieee80211_input.h>
 
@@ -76,7 +77,8 @@ const char *ieee80211_opmode_name[IEEE80
 	"WDS",		/* IEEE80211_M_WDS */
 	"AHDEMO",	/* IEEE80211_M_AHDEMO */
 	"HOSTAP",	/* IEEE80211_M_HOSTAP */
-	"MONITOR"	/* IEEE80211_M_MONITOR */
+	"MONITOR",	/* IEEE80211_M_MONITOR */
+	"MBSS"		/* IEEE80211_M_MBSS */
 };
 const char *ieee80211_state_name[IEEE80211_S_MAX] = {
 	"INIT",		/* IEEE80211_S_INIT */
@@ -143,6 +145,7 @@ ieee80211_proto_attach(struct ieee80211c
 	ieee80211_sta_attach(ic);
 	ieee80211_wds_attach(ic);
 	ieee80211_hostap_attach(ic);
+	ieee80211_mesh_attach(ic);
 	ieee80211_monitor_attach(ic);
 }
 
@@ -150,6 +153,7 @@ void
 ieee80211_proto_detach(struct ieee80211com *ic)
 {
 	ieee80211_monitor_detach(ic);
+	ieee80211_mesh_detach(ic);
 	ieee80211_hostap_detach(ic);
 	ieee80211_wds_detach(ic);
 	ieee80211_adhoc_detach(ic);