From owner-svn-src-projects@FreeBSD.ORG Thu Jul 9 23:50:37 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 66287106566C;
Thu, 9 Jul 2009 23:50:37 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 55F758FC0C;
Thu, 9 Jul 2009 23:50:37 +0000 (UTC) (envelope-from sam@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 n69NobYF000969;
Thu, 9 Jul 2009 23:50:37 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n69NobnS000967;
Thu, 9 Jul 2009 23:50:37 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200907092350.n69NobnS000967@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Thu, 9 Jul 2009 23:50:37 +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: r195521 - 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 " projects"
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: Thu, 09 Jul 2009 23:50:37 -0000
Author: sam
Date: Thu Jul 9 23:50:37 2009
New Revision: 195521
URL: http://svn.freebsd.org/changeset/base/195521
Log:
add a hack to flush pending frames in the stageq waiting for path discovery;
this belongs in the hwmp module hidden behind a method pointer and probably
is needed for other cases but will leave that for rui
Modified:
projects/mesh11s/sys/net80211/ieee80211_mesh.c
Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c Thu Jul 9 23:12:47 2009 (r195520)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Thu Jul 9 23:50:37 2009 (r195521)
@@ -348,6 +348,7 @@ ieee80211_mesh_detach(struct ieee80211co
static void
mesh_vdetach_peers(void *arg, struct ieee80211_node *ni)
{
+ struct ieee80211com *ic = ni->ni_ic;
uint16_t args[3];
if (ni->ni_mlstate == IEEE80211_NODE_MESH_ESTABLISHED) {
@@ -360,6 +361,9 @@ mesh_vdetach_peers(void *arg, struct iee
args);
}
callout_stop(&ni->ni_mltimer);
+ /* XXX belongs in hwmp */
+ ieee80211_ageq_drain_node(&ic->ic_stageq,
+ (void *)(uintptr_t) ieee80211_mac_hash(ic, ni->ni_macaddr));
}