svn commit: r194004 - projects/mesh11s/sys/net80211
Rui Paulo
rpaulo at FreeBSD.org
Thu Jun 11 14:44:11 UTC 2009
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 */
More information about the svn-src-projects
mailing list