From owner-svn-src-projects@FreeBSD.ORG  Tue Apr 21 14:23:19 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 5BD2F106566B;
	Tue, 21 Apr 2009 14:23:19 +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 4B2D18FC08;
	Tue, 21 Apr 2009 14:23:19 +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 n3LENIQm011938;
	Tue, 21 Apr 2009 14:23:18 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LENIul011937;
	Tue, 21 Apr 2009 14:23:18 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904211423.n3LENIul011937@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 21 Apr 2009 14:23:18 +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: r191357 - 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: Tue, 21 Apr 2009 14:23:19 -0000

Author: rpaulo
Date: Tue Apr 21 14:23:18 2009
New Revision: 191357
URL: http://svn.freebsd.org/changeset/base/191357

Log:
  Make this build.
  
  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	Tue Apr 21 12:47:09 2009	(r191356)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Apr 21 14:23:18 2009	(r191357)
@@ -140,10 +140,10 @@ 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 ieee80211vap *vap = ni->ni_vap;
+	struct ieee80211com *ic = ni->ni_ic;*/
 	struct ieee80211_frame *wh;
+	uint8_t *frm, *efrm;
 
 	wh = mtod(m0, struct ieee80211_frame *);
 	frm = (uint8_t *)&wh[1];
@@ -154,8 +154,8 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 	{
 		struct ieee80211_scanparams scan;
 
-		/* NB: accept off-channel frames */
-		if (ieee80211_parse_beacon(ni, m0, &scan) &~ IEEE80211_BPARSE_OF
+		/* Parse beacons to discover mesh neighbours */
+		if (ieee80211_parse_beacon(ni, m0, &scan) != 0)
 			return;
 		break;
 	}