From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 17 16:14:32 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 D6961106566B;
	Wed, 17 Jun 2009 16:14:32 +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 C58F38FC18;
	Wed, 17 Jun 2009 16:14:32 +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 n5HGEWUs080728;
	Wed, 17 Jun 2009 16:14:32 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5HGEW2E080726;
	Wed, 17 Jun 2009 16:14:32 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906171614.n5HGEW2E080726@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 17 Jun 2009 16:14:32 +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: r194372 - 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: Wed, 17 Jun 2009 16:14:33 -0000

Author: rpaulo
Date: Wed Jun 17 16:14:32 2009
New Revision: 194372
URL: http://svn.freebsd.org/changeset/base/194372

Log:
  * stop callouts on detach
  * discard mesh peer action frames if dest is not us.
  
  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	Wed Jun 17 15:57:53 2009	(r194371)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jun 17 16:14:32 2009	(r194372)
@@ -109,8 +109,17 @@ ieee80211_mesh_detach(struct ieee80211co
 }
 
 static void
+mesh_detach_stoptimers(void *arg, struct ieee80211_node *ni)
+{
+	callout_stop(&ni->ni_mltimer);
+}
+
+
+static void
 mesh_vdetach(struct ieee80211vap *vap)
 {
+	ieee80211_iterate_nodes(&vap->iv_ic->ic_sta, mesh_detach_stoptimers,
+	    NULL);
 	ieee80211_hwmp_vdetach(vap);
 }
 
@@ -249,7 +258,7 @@ mesh_linkchange(struct ieee80211_node *n
  * peer establishment.
  */
 static void
-_mesh_checkid(void *arg, struct ieee80211_node *ni)
+mesh_checkid(void *arg, struct ieee80211_node *ni)
 {
 	uint16_t *r = arg;
 	
@@ -264,7 +273,7 @@ mesh_generateid(struct ieee80211vap *vap
 
 restart:
 	get_random_bytes(&r, 2);
-	ieee80211_iterate_nodes(&vap->iv_ic->ic_sta, _mesh_checkid, &r);
+	ieee80211_iterate_nodes(&vap->iv_ic->ic_sta, mesh_checkid, &r);
 	if (r == 0)
 		goto restart;
 
@@ -714,6 +723,12 @@ mesh_recv_action(struct ieee80211_node *
 	 */
 	case IEEE80211_ACTION_CAT_MESHPEERING:
 		/*
+		 * Discard if not for us.
+		 */
+		if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1))
+			return;
+
+		/*
 		 * Compute the start of fixed/tagged parameters.
 		 */
 		switch (ia->ia_action) {