Date: Fri, 10 Jul 2009 11:53:35 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r195551 - projects/mesh11s/sys/net80211 Message-ID: <200907101153.n6ABrZLf019273@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Fri Jul 10 11:53:35 2009 New Revision: 195551 URL: http://svn.freebsd.org/changeset/base/195551 Log: Fix previous to include the function inside mesh.h. To accomplish this, I had to movie IEEE80211_MESHID_LEN to ieee80211.h and include ieee80211_mesh.h on a bunch of files (should've done that in the first place). Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211.h projects/mesh11s/sys/net80211/ieee80211_action.c projects/mesh11s/sys/net80211/ieee80211_ddb.c projects/mesh11s/sys/net80211/ieee80211_hwmp.c projects/mesh11s/sys/net80211/ieee80211_mesh.c projects/mesh11s/sys/net80211/ieee80211_mesh.h projects/mesh11s/sys/net80211/ieee80211_node.h projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Modified: projects/mesh11s/sys/net80211/ieee80211.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211.h Fri Jul 10 11:34:42 2009 (r195550) +++ projects/mesh11s/sys/net80211/ieee80211.h Fri Jul 10 11:53:35 2009 (r195551) @@ -185,6 +185,7 @@ struct ieee80211_qosframe_addr4 { (IEEE80211_SEQ_SUB(b, a+1) < IEEE80211_SEQ_BA_RANGE-1) #define IEEE80211_NWID_LEN 32 +#define IEEE80211_MESHID_LEN 32 #define IEEE80211_QOS_TXOP 0x00ff /* bit 8 is reserved */ Modified: projects/mesh11s/sys/net80211/ieee80211_action.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_action.c Fri Jul 10 11:34:42 2009 (r195550) +++ projects/mesh11s/sys/net80211/ieee80211_action.c Fri Jul 10 11:53:35 2009 (r195551) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_action.h> +#include <net80211/ieee80211_mesh.h> static int send_inval(struct ieee80211_node *ni, int cat, int act, void *sa) Modified: projects/mesh11s/sys/net80211/ieee80211_ddb.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_ddb.c Fri Jul 10 11:34:42 2009 (r195550) +++ projects/mesh11s/sys/net80211/ieee80211_ddb.c Fri Jul 10 11:53:35 2009 (r195551) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #ifdef IEEE80211_SUPPORT_TDMA #include <net80211/ieee80211_tdma.h> #endif +#include <net80211/ieee80211_mesh.h> #include <ddb/ddb.h> #include <ddb/db_sym.h> Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Fri Jul 10 11:34:42 2009 (r195550) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Fri Jul 10 11:53:35 2009 (r195551) @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_action.h> #include <net80211/ieee80211_input.h> +#include <net80211/ieee80211_mesh.h> static void hwmp_vattach(struct ieee80211vap *); static void hwmp_vdetach(struct ieee80211vap *); Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Jul 10 11:34:42 2009 (r195550) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Jul 10 11:53:35 2009 (r195551) @@ -2358,14 +2358,6 @@ ieee80211_mesh_init_neighbor(struct ieee ieee80211_parse_meshid(ni, sp->meshid); } -static __inline struct ieee80211_node * -ieee80211_mesh_discover(struct ieee80211vap *vap, - const uint8_t dest[IEEE80211_ADDR_LEN], struct mbuf *m) -{ - struct ieee80211_mesh_state *ms = vap->iv_mesh; - return ms->ms_ppath->mpp_discover(vap, dest, m); -} - static int mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq) { Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Jul 10 11:34:42 2009 (r195550) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Jul 10 11:53:35 2009 (r195551) @@ -36,7 +36,6 @@ /* * NB: all structures are__packed so sizeof works on arm, et. al. */ - /* * 802.11s Information Elements. */ @@ -101,8 +100,6 @@ struct ieee80211_meshid_ie { uint8_t id_len; } __packed; -#define IEEE80211_MESHID_LEN IEEE80211_NWID_LEN - /* Link Metric Report */ struct ieee80211_meshlmetric_ie { uint8_t lm_ie; /* IEEE80211_ELEMID_MESHLINK */ @@ -493,8 +490,13 @@ struct ieee80211_scanparams; void ieee80211_mesh_init_neighbor(struct ieee80211_node *, const struct ieee80211_frame *, const struct ieee80211_scanparams *); -__inline struct ieee80211_node * - ieee80211_mesh_discover(struct ieee80211vap *, - const uint8_t [IEEE80211_ADDR_LEN], struct mbuf *); +static __inline struct ieee80211_node * +ieee80211_mesh_discover(struct ieee80211vap *vap, + const uint8_t dest[IEEE80211_ADDR_LEN], struct mbuf *m) +{ + struct ieee80211_mesh_state *ms = vap->iv_mesh; + return ms->ms_ppath->mpp_discover(vap, dest, m); +} + #endif /* _KERNEL */ #endif /* !_NET80211_IEEE80211_MESH_H_ */ Modified: projects/mesh11s/sys/net80211/ieee80211_node.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_node.h Fri Jul 10 11:34:42 2009 (r195550) +++ projects/mesh11s/sys/net80211/ieee80211_node.h Fri Jul 10 11:53:35 2009 (r195551) @@ -30,7 +30,6 @@ #include <net80211/ieee80211_ioctl.h> /* for ieee80211_nodestats */ #include <net80211/ieee80211_ht.h> /* for aggregation state */ -#include <net80211/ieee80211_mesh.h> /* for mesh defines */ /* * Each ieee80211com instance has a single timer that fires every Modified: projects/mesh11s/sys/net80211/ieee80211_scan_sta.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Fri Jul 10 11:34:42 2009 (r195550) +++ projects/mesh11s/sys/net80211/ieee80211_scan_sta.c Fri Jul 10 11:53:35 2009 (r195551) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #ifdef IEEE80211_SUPPORT_TDMA #include <net80211/ieee80211_tdma.h> #endif +#include <net80211/ieee80211_mesh.h> #include <net/bpf.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907101153.n6ABrZLf019273>