Date: Tue, 7 Jul 2009 19:29:55 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r195427 - projects/mesh11s/sys/net80211 Message-ID: <200907071929.n67JTt9s027104@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Tue Jul 7 19:29:55 2009 New Revision: 195427 URL: http://svn.freebsd.org/changeset/base/195427 Log: Remove ieee80211_hwmp.h since its code only relates to ieee80211_hwmp.c. Sponsored by: The FreeBSD Foundation Deleted: projects/mesh11s/sys/net80211/ieee80211_hwmp.h Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Tue Jul 7 18:11:05 2009 (r195426) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Tue Jul 7 19:29:55 2009 (r195427) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_action.h> -#include <net80211/ieee80211_hwmp.h> #include <net80211/ieee80211_input.h> static void hwmp_vattach(struct ieee80211vap *); @@ -155,6 +154,30 @@ static const uint8_t broadcastaddr[IEEE8 static const uint8_t invalidaddr[IEEE80211_ADDR_LEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +typedef uint32_t ieee80211_hwmp_seq; +#define IEEE80211_HWMP_SEQ_LEQ(a, b) ((int32_t)((a)-(b)) <= 0) +#define IEEE80211_HWMP_SEQ_GEQ(a, b) ((int32_t)((a)-(b)) >= 0) + +/* + * Private extension of ieee80211_mesh_route. + */ +struct ieee80211_hwmp_route { + ieee80211_hwmp_seq hr_seq; /* HWMP sequence number */ + ieee80211_hwmp_seq hr_preqid; /* Last PREQ ID seen */ + int hr_preqretries; +}; +struct ieee80211_hwmp_state { + ieee80211_hwmp_seq hs_seq; /* next seq to be used */ + ieee80211_hwmp_seq hs_preqid; /* next PREQ ID to be used */ + struct timeval hs_lastpreq; /* last time we sent a PREQ */ + struct timeval hs_lastprep; /* last time we sent a PREP */ + struct timeval hs_lastperr; /* last time we sent a PERR */ + int hs_rootmode; /* proactive HWMP */ + struct callout hs_roottimer; + uint8_t hs_maxhops; /* max hop count */ + uint8_t hs_ttl; /* HWMP ttl */ +}; + SYSCTL_NODE(_net_wlan, OID_AUTO, hwmp, CTLFLAG_RD, 0, "IEEE 802.11s HWMP parameters"); SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, targetonly, CTLTYPE_INT | CTLFLAG_RW, Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Tue Jul 7 18:11:05 2009 (r195426) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Tue Jul 7 19:29:55 2009 (r195427) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_action.h> -#include <net80211/ieee80211_hwmp.h> #include <net80211/ieee80211_input.h> #include <net80211/ieee80211_mesh.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907071929.n67JTt9s027104>