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

[Rui Paulo]

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