From owner-svn-src-projects@FreeBSD.ORG  Fri Jul  3 21:45:56 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 BD3781065670;
	Fri,  3 Jul 2009 21:45:56 +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 AC3B38FC0A;
	Fri,  3 Jul 2009 21:45:56 +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 n63LjuVo089295;
	Fri, 3 Jul 2009 21:45:56 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n63Lju4c089293;
	Fri, 3 Jul 2009 21:45:56 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200907032145.n63Lju4c089293@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 3 Jul 2009 21:45:56 +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: r195327 - 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: Fri, 03 Jul 2009 21:45:57 -0000

Author: rpaulo
Date: Fri Jul  3 21:45:56 2009
New Revision: 195327
URL: http://svn.freebsd.org/changeset/base/195327

Log:
  hwmp_newstate(): use !init -> init state instead and don't use
  callout_active().
  
  Submited by:	sam

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

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Fri Jul  3 21:43:49 2009	(r195326)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Fri Jul  3 21:45:56 2009	(r195327)
@@ -310,11 +310,14 @@ ieee80211_hwmp_newstate(struct ieee80211
 	enum ieee80211_state nstate = vap->iv_state;
 	struct ieee80211_hwmp_state *hs = vap->iv_hwmp;
 
-	/* Flush the table on INIT -> SCAN, e.g. interface down & up */
-	if (nstate == IEEE80211_S_SCAN && ostate == IEEE80211_S_INIT) {
+        IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
+            __func__, ieee80211_state_name[ostate],
+            ieee80211_state_name[nstate], arg);
+
+	/* Flush the table on !INIT -> INIT, e.g. interface down & up */
+	if (nstate != IEEE80211_S_INIT && ostate == IEEE80211_S_INIT) {
 		hwmp_rt_flush(vap);
-		if (callout_active(&hs->hs_roottimer))
-			callout_drain(&hs->hs_roottimer);
+		callout_drain(&hs->hs_roottimer);
 	}
 	return 0;
 }