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

[Rui Paulo]

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);