From owner-svn-src-projects@FreeBSD.ORG Thu Jun 11 14:44:11 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 21595106566B; Thu, 11 Jun 2009 14:44:11 +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 E9A5A8FC14; Thu, 11 Jun 2009 14:44:10 +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 n5BEiATY050493; Thu, 11 Jun 2009 14:44:10 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5BEiAPR050491; Thu, 11 Jun 2009 14:44:10 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906111444.n5BEiAPR050491@svn.freebsd.org> From: Rui Paulo Date: Thu, 11 Jun 2009 14:44:10 +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: r194004 - 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: Thu, 11 Jun 2009 14:44:11 -0000 Author: rpaulo Date: Thu Jun 11 14:44:10 2009 New Revision: 194004 URL: http://svn.freebsd.org/changeset/base/194004 Log: Create M_80211_HWMP and use it. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c projects/mesh11s/sys/net80211/ieee80211_hwmp.h Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Thu Jun 11 14:37:18 2009 (r194003) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Thu Jun 11 14:44:10 2009 (r194004) @@ -143,6 +143,8 @@ SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, roo "3 = Root with RANNs"); #endif +MALLOC_DEFINE(M_80211_HWMP, "80211hwmp", "802.11 HWMP routing table"); + extern int ieee80211_mesh_ttl; void @@ -153,7 +155,7 @@ ieee80211_hwmp_vattach(struct ieee80211v KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, ("not a mesh vap, opmode %d", vap->iv_opmode)); - hs = malloc(sizeof(struct ieee80211_hwmp_state), M_80211_VAP, + hs = malloc(sizeof(struct ieee80211_hwmp_state), M_80211_HWMP, M_NOWAIT | M_ZERO); if (hs == NULL) { printf("%s: couldn't alloc HWMP state\n", __func__); @@ -502,7 +504,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, * Record the PREQ ID and the originator MAC address. */ if (fi == NULL) { - fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_VAP, + fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_HWMP, M_NOWAIT | M_ZERO); memset(fi, 0, sizeof(*fi)); IEEE80211_ADDR_COPY(fi->fi_dest, preq->preq_origaddr); @@ -917,7 +919,7 @@ ieee80211_hwmp_discover(struct ieee80211 mtx_unlock(&hs->hs_lock); if (fi == NULL) { - fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_VAP, + fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_HWMP, M_NOWAIT | M_ZERO); IEEE80211_ADDR_COPY(fi->fi_dest, dest); fi->fi_seq = ++hs->hs_seq; Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.h Thu Jun 11 14:37:18 2009 (r194003) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h Thu Jun 11 14:44:10 2009 (r194004) @@ -50,6 +50,9 @@ struct ieee80211_hwmp_fi { }; #ifdef _KERNEL + +MALLOC_DECLARE(M_80211_HWMP); + struct ieee80211_hwmp_state { TAILQ_HEAD(, ieee80211_hwmp_fi) hs_head; ieee80211_hwmp_seq hs_seq; /* next seq to be used */