From owner-svn-src-projects@FreeBSD.ORG Fri Jun 26 11:56:48 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 2C69A106564A; Fri, 26 Jun 2009 11:56:47 +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 B5DDC8FC08; Fri, 26 Jun 2009 11:56:47 +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 n5QBulDQ085745; Fri, 26 Jun 2009 11:56:47 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5QBulko085743; Fri, 26 Jun 2009 11:56:47 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906261156.n5QBulko085743@svn.freebsd.org> From: Rui Paulo Date: Fri, 26 Jun 2009 11:56:47 +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: r195051 - 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: Fri, 26 Jun 2009 11:56:48 -0000 Author: rpaulo Date: Fri Jun 26 11:56:47 2009 New Revision: 195051 URL: http://svn.freebsd.org/changeset/base/195051 Log: * add more draft bits * remove MCCA stuff that won't be done in any near future. We can always bring it back from SVN if needed. The purpose is to reduce diff against HEAD. 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 Fri Jun 26 11:55:44 2009 (r195050) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Fri Jun 26 11:56:47 2009 (r195051) @@ -162,43 +162,6 @@ struct ieee80211_meshbeacont_ie { uint16_t mp_bint; /* Beacon Interval */ } __packed mp[1]; /* NB: variable size */ } __packed; - -/* MDAOP Setup Request */ -struct ieee80211_meshdaopsreq_ie { - uint8_t daopsreq_ie; /* IEEE80211_ELEMID_MESHDAOPSREQ */ - uint8_t daopsreq_len; - uint8_t daopsreq_setid; - uint32_t daposreq_reserv; /* MDAOP Reservation */ -} __packed; - -/* MDAOP Setup Reply */ -struct ieee80211_meshdaopsrep_ie { - uint8_t daopsrep_ie; /* IEEE80211_ELEMID_MESHDAOPSREPLY */ - uint8_t daopsrep_len; - uint8_t daopsrep_setid; - uint8_t daopsrep_code; /* Reply Code */ - uint8_t daopsrep_reserv; /* MDAOP Reservation */ -} __packed; - -enum { - IEEE80211_MESH_DAOP_REPLY_ACCEPT = 0, - IEEE80211_MESH_DAOP_REPLY_RESERV_CONFLICT = 1, - IEEE80211_MESH_DAOP_REPLY_MAF_LIMIT = 2, - /* everything else is reserved */ -}; - -/* MDAOP Advertisements */ -/* TBD */ - - -/* MDAOP Set Teardown */ -struct ieee80211_meshdaopst_ie { - uint8_t daopsrep_ie; /* IEEE80211_ELEMID_MESHDAOPSREP */ - uint8_t daopsrep_len; - uint8_t daopsrep_setid; - uint8_t daopsrep_setowner[IEEE80211_ADDR_LEN]; -} __packed; - #endif /* Portal (MP) Annoucement */ @@ -285,7 +248,14 @@ struct ieee80211_meshperr_ie { struct ieee80211_meshpu_ie { uint8_t pu_ie; /* IEEE80211_ELEMID_MESHPU */ uint8_t pu_len; - /* XXXRP: TBD */ + uint8_t pu_flags; +#define IEEE80211_MESHPU_FLAGS_MASK 0x1 +#define IEEE80211_MESHPU_FLAGS_DEL 0x0 +#define IEEE80211_MESHPU_FLAGS_ADD 0x1 + uint8_t pu_seq; /* PU Sequence Number */ + uint8_t pu_addr[IEEE80211_ADDR_LEN]; + uint8_t pu_naddr; /* Number of Proxied Addresses */ + /* NB: proxied address follows */ } __packed; /* Mesh Proxy Update Confirmation */ @@ -339,6 +309,14 @@ enum { }; /* + * Mesh Portal Annoucement Action codes. + */ +enum { + IEEE80211_ACTION_MESHPANN = 0, + /* 1-255 reserved */ +}; + +/* * Different mesh control structures based on the AE * (Address Extension) bits. *