Date: Wed, 27 May 2009 00:06:19 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r192865 - projects/mesh11s/sys/net80211 Message-ID: <200905270006.n4R06JhW077962@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Wed May 27 00:06:19 2009 New Revision: 192865 URL: http://svn.freebsd.org/changeset/base/192865 Log: Add remaining mesh conf bits and improve style. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Tue May 26 22:40:12 2009 (r192864) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Wed May 27 00:06:19 2009 (r192865) @@ -52,30 +52,42 @@ struct ieee80211_meshconf_ie { /* Null Protocol */ #define IEEE80211_MESHCONF_NULL_OUI 0x00, 0x0f, 0xac #define IEEE80211_MESHCONF_NULL_VALUE 0xff -#define IEEE80211_MESHCONF_NULL { IEEE80211_MESHCONF_NULL_OUI, IEEE80211_MESHCONF_NULL_VALUE } +#define IEEE80211_MESHCONF_NULL { IEEE80211_MESHCONF_NULL_OUI, \ + IEEE80211_MESHCONF_NULL_VALUE } /* Hybrid Wireless Mesh Protocol */ #define IEEE80211_MESHCONF_HWMP_OUI 0x00, 0x0f, 0xac #define IEEE80211_MESHCONF_HWMP_VALUE 0xff /* XXX Linux */ -#define IEEE80211_MESHCONF_HWMP { IEEE80211_MESHCONF_HWMP_OUI, IEEE80211_MESHCONF_HWMP_VALUE } +#define IEEE80211_MESHCONF_HWMP { IEEE80211_MESHCONF_HWMP_OUI, \ + IEEE80211_MESHCONF_HWMP_VALUE } /* Airtime Link Metric */ #define IEEE80211_MESHCONF_AIRTIME_OUI 0x00, 0x0f, 0xac #define IEEE80211_MESHCONF_AIRTIME_VALUE 0xff /* XXX Linux */ -#define IEEE80211_MESHCONF_AIRTIME { IEEE80211_MESHCONF_AIRTIME_OUI, IEEE80211_MESHCONF_AIRTIME_VALUE } +#define IEEE80211_MESHCONF_AIRTIME { IEEE80211_MESHCONF_AIRTIME_OUI, \ + IEEE80211_MESHCONF_AIRTIME_VALUE } /* Congestion Control Signaling */ #define IEEE80211_MESHCONF_CCSIG_OUI 0x00, 0x0f, 0xac #define IEEE80211_MESHCONF_CCSIG_VALUE 0xff /* XXX Linux */ -#define IEEE80211_MESHCONF_CCSIG { IEEE80211_MESHCONF_CCSIG_OUI, IEEE80211_MESHCONF_CCSIG_VALUE } +#define IEEE80211_MESHCONF_CCSIG { IEEE80211_MESHCONF_CCSIG_OUI,\ + IEEE80211_MESHCONF_CCSIG_VALUE } /* Neighbour Offset */ #define IEEE80211_MESHCONF_NEIGHOFF_OUI 0x00, 0x0f, 0xac #define IEEE80211_MESHCONF_NEIGHOFF_VALUE 0x00 -#define IEEE80211_MESHCONF_NEIGHOFF { IEEE80211_MESHCONF_NEIGHOFF_OUI, IEEE80211_MESHCONF_NEIGHOFF_VALUE } +#define IEEE80211_MESHCONF_NEIGHOFF { IEEE80211_MESHCONF_NEIGHOFF_OUI, \ + IEEE80211_MESHCONF_NEIGHOFF_VALUE } /* Simultaneous Authenticaction of Equals */ #define IEEE80211_MESHCONF_SAE_OUI 0x00, 0x0f, 0xac #define IEEE80211_MESHCONF_SAE_VALUE 0x01 -#define IEEE80211_MESHCONF_SAE { IEEE80211_MESHCONF_SAE_OUI, IEEE80211_MESHCONF_SAE_VALUE } -#define IEEE80211_MESHCONF_FORM_MP (1 << 1) /* connected to portal */ -#define IEEE80211_MESHCONF_FORM_NEIGH (1 << 4) /* no of neighbours */ -/* XXX ... */ +#define IEEE80211_MESHCONF_SAE { IEEE80211_MESHCONF_SAE_OUI, \ + IEEE80211_MESHCONF_SAE_VALUE } +#define IEEE80211_MESHCONF_FORM_MP 0x01 /* Connected to Portal */ +#define IEEE80211_MESHCONF_FORM_NNEIGH_MASK 0x04 /* Number of Neighbours */ +#define IEEE80211_MESHCONF_CAP_AP 0x01 /* Accepting Peers */ +#define IEEE80211_MESHCONF_CAP_MCCAS 0x02 /* MCCA supported */ +#define IEEE80211_MESHCONF_CAP_MCCAE 0x04 /* MCCA enabled */ +#define IEEE80211_MESHCONF_CAP_FRWD 0x08 /* forwarding enabled */ +#define IEEE80211_MESHCONF_CAP_BTR 0x10 /* Beacon Timing Report Enab */ +#define IEEE80211_MESHCONF_CAP_TBTTA 0x20 /* TBTT Adj. Enabled */ +#define IEEE80211_MESHCONF_CAP_PSL 0x40 /* Power Save Level */ /* Mesh Identifier */ struct ieee80211_meshid_ie {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905270006.n4R06JhW077962>