From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 16 21:57:53 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 6757A106566C;
	Thu, 16 Apr 2009 21:57:53 +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 3B8348FC0C;
	Thu, 16 Apr 2009 21:57:53 +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 n3GLvq9T092953;
	Thu, 16 Apr 2009 21:57:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3GLvqwF092951;
	Thu, 16 Apr 2009 21:57:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904162157.n3GLvqwF092951@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 16 Apr 2009 21:57: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: r191152 - 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: Thu, 16 Apr 2009 21:57:53 -0000

Author: rpaulo
Date: Thu Apr 16 21:57:52 2009
New Revision: 191152
URL: http://svn.freebsd.org/changeset/base/191152

Log:
  Add some initial code.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c
  projects/mesh11s/sys/net80211/ieee80211_mesh.h

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Apr 16 21:56:34 2009	(r191151)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Apr 16 21:57:52 2009	(r191152)
@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 /*
- * IEEE 802.11s Mesh support.
+ * IEEE 802.11s Mesh Point (MBSS) support.
  */
 #include "opt_inet.h"
 #include "opt_wlan.h"
@@ -55,6 +55,49 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 
 #include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_sta.h>
+#include <net80211/ieee80211_mesh.h>
 #include <net80211/ieee80211_input.h>
 
+static void	mesh_vattach(struct ieee80211vap *);
+static int	mesh_newstate(struct ieee80211vap *, enum ieee80211_state, int);
+static int	mesh_input(struct ieee80211_node *, struct mbuf *, int, int,
+		    uint32_t);
+
+void
+ieee80211_mesh_attach(struct ieee80211com *ic)
+{
+	ic->ic_vattach[IEEE80211_M_MBSS] = mesh_vattach;
+}
+
+void
+ieee80211_mesh_detach(struct ieee80211com *ic)
+{
+}
+
+static void
+mesh_vattach(struct ieee80211vap *vap)
+{
+	vap->iv_newstate = mesh_newstate;
+	vap->iv_input = mesh_input;
+	vap->iv_opdetach = mesh_vdetach;
+}
+
+static int
+mesh_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
+{
+	struct ieee80211com *ic = vap->iv_ic;
+	enum ieee80211_state ostate;
+
+	IEEE80211_LOCK_ASSERT(ic);
+
+        ostate = vap->iv_state;
+        IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
+            __func__, ieee80211_state_name[ostate],
+            ieee80211_state_name[nstate], arg);
+        vap->iv_state = nstate;                 /* state transition */
+        if (ostate != IEEE80211_S_SCAN)
+                ieee80211_cancel_scan(vap);     /* background scan */
+        switch (nstate) {
+	}
+}
+

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Thu Apr 16 21:56:34 2009	(r191151)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Thu Apr 16 21:57:52 2009	(r191152)
@@ -27,4 +27,7 @@
 #ifndef _NET80211_IEEE80211_MESH_H_
 #define _NET80211_IEEE80211_MESH_H_
 
+void	ieee80211_mesh_attach(struct ieee80211com *);
+void	ieee80211_mesh_detach(struct ieee80211com *);
+
 #endif /* !_NET80211_IEEE80211_MESH_H_ */