From owner-svn-src-projects@FreeBSD.ORG Fri Jun 12 12:05:56 2009 Return-Path: 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 1FED11065690; Fri, 12 Jun 2009 12:05: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 0D3998FC17; Fri, 12 Jun 2009 12:05: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 n5CC5t0F081469; Fri, 12 Jun 2009 12:05:55 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5CC5tXP081468; Fri, 12 Jun 2009 12:05:55 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906121205.n5CC5tXP081468@svn.freebsd.org> From: Rui Paulo Date: Fri, 12 Jun 2009 12:05:55 +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: r194057 - 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jun 2009 12:05:57 -0000 Author: rpaulo Date: Fri Jun 12 12:05:55 2009 New Revision: 194057 URL: http://svn.freebsd.org/changeset/base/194057 Log: Flush HWMP table on vap detach. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Fri Jun 12 11:50:44 2009 (r194056) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Fri Jun 12 12:05:55 2009 (r194057) @@ -165,10 +165,14 @@ void ieee80211_hwmp_vdetach(struct ieee80211vap *vap) { struct ieee80211_hwmp_state *hs = vap->iv_hwmp; + struct ieee80211_hwmp_fi *fi, *next; - /* XXX missing flush table */ + TAILQ_FOREACH_SAFE(fi, &hs->hs_head, fi_next, next) { + TAILQ_REMOVE(&hs->hs_head, fi, fi_next); + free(fi, M_80211_HWMP); + } mtx_destroy(&hs->hs_lock); - free(vap->iv_hwmp, M_80211_VAP); + free(vap->iv_hwmp, M_80211_HWMP); } void