From owner-svn-src-projects@FreeBSD.ORG Sat May 23 21:49:36 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 CD47F1065672; Sat, 23 May 2009 21:49:36 +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 BC3ED8FC12; Sat, 23 May 2009 21:49:36 +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 n4NLnaT8068889; Sat, 23 May 2009 21:49:36 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4NLnaDE068885; Sat, 23 May 2009 21:49:36 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200905232149.n4NLnaDE068885@svn.freebsd.org> From: Rui Paulo Date: Sat, 23 May 2009 21:49:36 +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: r192670 - 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: Sat, 23 May 2009 21:49:37 -0000 Author: rpaulo Date: Sat May 23 21:49:36 2009 New Revision: 192670 URL: http://svn.freebsd.org/changeset/base/192670 Log: Fix the build Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c projects/mesh11s/sys/net80211/ieee80211_mesh.c projects/mesh11s/sys/net80211/ieee80211_mesh.h projects/mesh11s/sys/net80211/ieee80211_output.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Sat May 23 21:43:44 2009 (r192669) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Sat May 23 21:49:36 2009 (r192670) @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); static int ieee80211_hwmp_maxhops = 31; +#ifdef notyet static int ieee80211_hwmp_maxhopstime = 500; static int ieee80211_hwmp_maxprepretries = 3; static int ieee80211_hwmp_prepminint = 100; @@ -77,6 +78,9 @@ static int ieee80211_hwmp_targetonly = 1 static int ieee80211_hwmp_replyforward = 1; /* propagate PREQs */ static int ieee80211_hwmp_pathmaintenance = 2000; static int ieee80211_hwmp_confirmint = 2000; +#endif + +extern int ieee80211_mesh_ttl; SYSCTL_NODE(_net_wlan, OID_AUTO, hwmp, CTLFLAG_RD, 0, "IEEE 802.11s HWMP parameters"); @@ -90,20 +94,23 @@ SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, roo void ieee80211_hwmp_recv_action(struct ieee80211vap *vap, struct ieee80211_node *ni, - struct mbuf *m) + struct mbuf *m0) { struct ieee80211_frame *wh; + struct ieee80211_action *ia; uint8_t *frm, *efrm; struct ieee80211_meshpreq_ie *meshpreq = NULL; struct ieee80211_meshprep_ie *meshprep = NULL; struct ieee80211_meshperr_ie *meshperr = NULL; + union ieee80211_send_action_args vargs; wh = mtod(m0, struct ieee80211_frame *); ia = (struct ieee80211_action *) &wh[1]; frm = (uint8_t *)&wh[1] + sizeof(struct ieee80211_action); efrm = mtod(m0, uint8_t *) + m0->m_len; - KASSERT(ia->ia_category == IEEE80211_ACTION_CAT_MESHPATH); + KASSERT(ia->ia_category == IEEE80211_ACTION_CAT_MESHPATH, + ("wrong category")); while (efrm - frm > 1) { IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return); @@ -181,6 +188,13 @@ ieee80211_hwmp_recv_action(struct ieee80 } +#define ADDWORD(frm, v) do { \ + frm[0] = (v) & 0xff; \ + frm[1] = ((v) >> 8) & 0xff; \ + frm[2] = ((v) >> 16) & 0xff; \ + frm[3] = ((v) >> 24) & 0xff; \ + frm += 4; \ +} while (0) /* * Add a Mesh Path Reply IE to a frame. */ @@ -192,7 +206,7 @@ ieee80211_add_meshprep(uint8_t *frm, str *frm++ = sizeof(struct ieee80211_meshprep_ie) - 2; *frm++ = prep->prep_flags; *frm++ = prep->prep_hopcount; - *frm++ = prep->prep_ttl; + *frm++ = prep->prep_ttl; IEEE80211_ADDR_COPY(frm, prep->prep_targetaddr); frm += 6; ADDWORD(frm, prep->prep_targetseq); Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Sat May 23 21:43:44 2009 (r192669) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Sat May 23 21:49:36 2009 (r192670) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include static void mesh_vattach(struct ieee80211vap *); @@ -85,7 +86,7 @@ static const int ieee80211_mesh_holdingt static const int ieee80211_mesh_confirmtimeout = 40; #define CONFIRM_TIMEOUT msecs_to_ticks(ieee80211_mesh_confirmtimeout) static const int ieee80211_mesh_maxretries = 2; -static int ieee80211_mesh_ttl = 31; +int ieee80211_mesh_ttl = 31; static int ieee80211_mesh_forwarding = 1; SYSCTL_NODE(_net_wlan, OID_AUTO, mesh, CTLFLAG_RD, 0, @@ -635,9 +636,6 @@ mesh_recv_action(struct ieee80211_node * struct ieee80211_meshid_ie *meshid = NULL; struct ieee80211_meshconf_ie *meshconf = NULL; struct ieee80211_meshpeer_ie *meshpeer = NULL; - struct ieee80211_meshpreq_ie *meshpreq = NULL; - struct ieee80211_meshprep_ie *meshprep = NULL; - struct ieee80211_meshperr_ie *meshperr = NULL; uint8_t *frm, *efrm; union ieee80211_send_action_args vargs; @@ -847,7 +845,7 @@ mesh_recv_action(struct ieee80211_node * * Mesh Path action frames are handled by the HWMP module. */ case IEEE80211_ACTION_CAT_MESHPATH: - ieee80211_hwmp_recv_action(vap, ni, m); + ieee80211_hwmp_recv_action(vap, ni, m0); break; /* * Airtime link metric handling. Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Sat May 23 21:43:44 2009 (r192669) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Sat May 23 21:49:36 2009 (r192670) @@ -332,8 +332,6 @@ uint8_t * ieee80211_add_meshid(uint8_t * uint8_t * ieee80211_add_meshconf(uint8_t *, struct ieee80211vap *); uint8_t * ieee80211_add_meshpeer(uint8_t *, uint8_t, uint16_t, uint16_t, uint16_t); -uint8_t * ieee80211_add_meshprep(uint8_t *, - struct ieee80211_meshprep_ie *); uint32_t ieee80211_airtime_calc(struct ieee80211vap *, struct ieee80211_node *); uint8_t * ieee80211_add_meshlink(uint8_t *, uint32_t); Modified: projects/mesh11s/sys/net80211/ieee80211_output.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_output.c Sat May 23 21:43:44 2009 (r192669) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Sat May 23 21:49:36 2009 (r192670) @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #endif #include #include +#include #ifdef INET #include