From owner-svn-src-projects@FreeBSD.ORG  Mon Apr 20 18:59:36 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 936A71065675;
	Mon, 20 Apr 2009 18:59:36 +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 832A58FC13;
	Mon, 20 Apr 2009 18:59:36 +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 n3KIxaxv055615;
	Mon, 20 Apr 2009 18:59:36 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KIxaZZ055614;
	Mon, 20 Apr 2009 18:59:36 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904201859.n3KIxaZZ055614@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 20 Apr 2009 18:59:36 +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: r191333 - 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 18:59:37 -0000

Author: rpaulo
Date: Mon Apr 20 18:59:36 2009
New Revision: 191333
URL: http://svn.freebsd.org/changeset/base/191333

Log:
  Add mesh_rcvd_mgmt().
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Apr 20 18:58:45 2009	(r191332)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Apr 20 18:59:36 2009	(r191333)
@@ -65,6 +65,8 @@ static void	mesh_vattach(struct ieee8021
 static int	mesh_newstate(struct ieee80211vap *, enum ieee80211_state, int);
 static int	mesh_input(struct ieee80211_node *, struct mbuf *, int, int,
 		    uint32_t);
+static void	mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int,
+		    int, int, uint32_t);
 
 void
 ieee80211_mesh_attach(struct ieee80211com *ic)
@@ -88,8 +90,12 @@ mesh_vattach(struct ieee80211vap *vap)
 	vap->iv_newstate = mesh_newstate;
 	vap->iv_input = mesh_input;
 	vap->iv_opdetach = mesh_vdetach;
+	vap->iv_recv_mgmt = mesh_recv_mgmt;
 }
 
+/*
+ * IEEE80211_M_MBSS vap state machine handler.
+ */
 static int
 mesh_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
@@ -128,3 +134,33 @@ mesh_input(struct ieee80211_node *ni, st
 
 	return 0;
 }
+
+
+static void
+mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype,
+    int rssi, int noise, uint32_t rstamp)
+{
+
+	struct ieee80211vap *vap = ni->ni_vap;
+	struct ieee80211com *ic = ni->ni_ic;
+	struct ieee80211_frame *wh;
+
+	wh = mtod(m0, struct ieee80211_frame *);
+	frm = (uint8_t *)&wh[1];
+	efrm = mtod(m0, uint8_t *) + m0->m_len;
+	switch (subtype) {
+	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
+	case IEEE80211_FC0_SUBTYPE_BEACON:
+	{
+		struct ieee80211_scanparams scan;
+
+		/* NB: accept off-channel frames */
+		if (ieee80211_parse_beacon(ni, m0, &scan) &~ IEEE80211_BPARSE_OF
+			return;
+		break;
+	}
+	default:
+		break;
+	}
+
+}