From owner-svn-src-projects@FreeBSD.ORG Tue Apr 28 17:36:31 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 372A41065677; Tue, 28 Apr 2009 17:36:31 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0B72D8FC23; Tue, 28 Apr 2009 17:36:31 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3SHaUAZ055524; Tue, 28 Apr 2009 17:36:30 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3SHaU3a055523; Tue, 28 Apr 2009 17:36:30 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904281736.n3SHaU3a055523@svn.freebsd.org> From: Rui Paulo Date: Tue, 28 Apr 2009 17:36:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191630 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2009 17:36:31 -0000 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 *);