From owner-svn-src-projects@FreeBSD.ORG Tue May 26 15:49:09 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 B357A1065673; Tue, 26 May 2009 15:49:09 +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 880E98FC16; Tue, 26 May 2009 15:49:09 +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 n4QFn9dF062844; Tue, 26 May 2009 15:49:09 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QFn98r062843; Tue, 26 May 2009 15:49:09 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200905261549.n4QFn98r062843@svn.freebsd.org> From: Rui Paulo Date: Tue, 26 May 2009 15:49:09 +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: r192814 - 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, 26 May 2009 15:49:10 -0000 Author: rpaulo Date: Tue May 26 15:49:09 2009 New Revision: 192814 URL: http://svn.freebsd.org/changeset/base/192814 Log: Code cleanup in preparation for the first try at implemeting HWMP. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Tue May 26 15:33:34 2009 (r192813) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Tue May 26 15:49:09 2009 (r192814) @@ -33,6 +33,8 @@ __FBSDID("$FreeBSD$"); /* * IEEE 802.11s Hybrid Wireless Mesh Protocol. + * + * Based on March 2009, D3.0 802.11s draft spec. */ #include "opt_inet.h" #include "opt_wlan.h" @@ -91,6 +93,12 @@ SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, roo &ieee80211_hwmp_rootmode, 0, "Root Mesh Point Node"); #endif +static void hwmp_recv_preq(struct ieee80211vap *, + const struct ieee80211_meshpreq_ie *); +static void hwmp_recv_prep(struct ieee80211vap *, + const struct ieee80211_meshprep_ie *); +static void hwmp_recv_perr(struct ieee80211vap *, + const struct ieee80211_meshperr_ie *); void ieee80211_hwmp_recv_action(struct ieee80211vap *vap, struct ieee80211_node *ni, @@ -152,6 +160,7 @@ ieee80211_hwmp_recv_action(struct ieee80 vap->iv_stats.is_rx_mgtdiscard++; return; } + hwmp_recv_preq(vap, meshpreq); /* * Is the peer trying to find us? */ @@ -180,8 +189,10 @@ ieee80211_hwmp_recv_action(struct ieee80 } break; case IEEE80211_ACTION_MESHPATH_REP: + hwmp_recv_prep(vap, meshprep); break; case IEEE80211_ACTION_MESHPATH_ERR: + hwmp_recv_perr(vap, meshperr); break; default: IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH, @@ -203,7 +214,7 @@ ieee80211_hwmp_recv_action(struct ieee80 * Add a Mesh Path Reply IE to a frame. */ uint8_t * -ieee80211_add_meshprep(uint8_t *frm, struct ieee80211_meshprep_ie *prep) +ieee80211_add_meshprep(uint8_t *frm, const struct ieee80211_meshprep_ie *prep) { *frm++ = IEEE80211_ELEMID_MESHPREP; @@ -222,3 +233,22 @@ ieee80211_add_meshprep(uint8_t *frm, str return frm; } + +static void +hwmp_recv_preq(struct ieee80211vap *vap, + const struct ieee80211_meshpreq_ie *preq) +{ +} + +static void +hwmp_recv_prep(struct ieee80211vap *vap, + const struct ieee80211_meshprep_ie *prep) +{ + +} +static void +hwmp_recv_perr(struct ieee80211vap *vap, + const struct ieee80211_meshprep_ie *perr) +{ + +}