Date: Tue, 28 Apr 2009 17:36:30 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r191630 - projects/mesh11s/sys/net80211 Message-ID: <200904281736.n3SHaU3a055523@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Tue Apr 28 17:36:30 2009 New Revision: 191630 URL: http://svn.freebsd.org/changeset/base/191630 Log: Sync again with draft. 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 Apr 28 13:23:13 2009 (r191629) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Tue Apr 28 17:36:30 2009 (r191630) @@ -149,27 +149,6 @@ struct ieee80211_meshbeacont_ie { } mp[1] __packed; /* NB: variable size */ } __packed; -/* Mesh Timing Info */ -struct ieee80211_meshtinfo_ie { - uint8_t tinfo_ie; /* IEEE80211_ELEMID_MESHTIMINGINFO */ - uint8_t tinfo_len; - uint8_t tinfo_field; -} __packed; - -#define IEEE80211_MESH_TINFO_BEACON_PARAMS_CHANGED (1 << 8) -#define IEEE80211_MESH_TINFO_MDA_ENABLED (1 << 7) - -/* Synchronization Protocol */ -struct ieee80211_meshsyncproto_ie { - uint8_t syncproto_ie; /* IEEE80211_ELEMID_MESHSYNCPROTO */ - uint8_t syncproto_len; - uint32_t syncproto_id; /* Sync Protocol ID OUI */ -} __packed; - -/* Neighbour Offset Protocol */ -#define IEEE80211_MESH_SYNCPROTO_NEIGHOFFSET_OUI 0x000fac -#define IEEE80211_MESH_SYNCPROTO_NEIGHOFFSET_VALUE 0 - /* MDAOP Setup Request */ struct ieee80211_meshdaopsreq_ie { uint8_t daopsreq_ie; /* IEEE80211_ELEMID_MESHDAOPSREQ */ @@ -271,36 +250,6 @@ struct ieee80211_meshpuc_ie { uint8_t puc_daddr[IEEE80211_ADDR_LEN]; } __packed; -/* Mesh Security Capability */ -struct ieee80211_meshsc_ie { - uint8_t sc_ie; /* IEEE80211_ELEMID_MESHSC */ - uint8_t sc_len; - uint8_t sc_mkdid[IEEE80211_ADDR_LEN]; /* MKD Domain ID */ - uint8_t sc_sconfig; /* Security Configuration */ -} __packed; - -/* Mesh Security Authentication */ -struct ieee80211_meshsa_ie { - uint8_t sa_ie; /* IEEE80211_ELEMID_MESHSA */ - uint8_t sa_len; - uint8_t sa_handshake; - uint8_t sa_maid[IEEE80211_ADDR_LEN]; /* MA-ID */ - uint8_t sa_lmpid[IEEE80211_ADDR_LEN]; - uint32_t sa_akm; /* Selected AKM Suite */ - uint32_t sa_pcs; /* Selected Pairwise Cipher Suite */ - uint8_t sa_pmk[16]; - uint8_t sa_lnonce[32]; - uint8_t sa_pnonce[32]; - /* XXX more parameters */ -} __packed; - -/* Mesh Anti-Clogging Token */ -struct ieee80211_meshact_ie { - uint8_t act_ie; /* IEEE80211_ELEMID_MESHACT */ - uint8_t act_len; -} __packed; - - void ieee80211_mesh_attach(struct ieee80211com *); void ieee80211_mesh_detach(struct ieee80211com *); void ieee80211_parse_meshid(struct ieee80211_node *, const uint8_t *);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904281736.n3SHaU3a055523>