From owner-svn-src-projects@FreeBSD.ORG Thu Apr 30 14:21:51 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 65FFF1065670; Thu, 30 Apr 2009 14:21:51 +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 3AE898FC15; Thu, 30 Apr 2009 14:21:51 +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 n3UELpZ5014630; Thu, 30 Apr 2009 14:21:51 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3UELpwt014629; Thu, 30 Apr 2009 14:21:51 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904301421.n3UELpwt014629@svn.freebsd.org> From: Rui Paulo Date: Thu, 30 Apr 2009 14:21:51 +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: r191691 - 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: Thu, 30 Apr 2009 14:21:51 -0000 Author: rpaulo Date: Thu Apr 30 14:21:50 2009 New Revision: 191691 URL: http://svn.freebsd.org/changeset/base/191691 Log: Don't forget to send our rates on mesh peer action frames. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_output.c Modified: projects/mesh11s/sys/net80211/ieee80211_output.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_output.c Thu Apr 30 13:53:00 2009 (r191690) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Thu Apr 30 14:21:50 2009 (r191691) @@ -69,6 +69,10 @@ __FBSDID("$FreeBSD$"); static int ieee80211_fragment(struct ieee80211vap *, struct mbuf *, u_int hdrsize, u_int ciphdrsize, u_int mtu); static void ieee80211_tx_mgt_cb(struct ieee80211_node *, void *, int); +static uint8_t * + ieee80211_add_rates(uint8_t *, const struct ieee80211_rateset *); +static uint8_t * + ieee80211_add_xrates(uint8_t *, const struct ieee80211_rateset *); #ifdef IEEE80211_DEBUG /* @@ -546,6 +550,7 @@ ieee80211_send_action(struct ieee80211_n struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; struct ieee80211_bpf_params params; + const struct ieee80211_rateset *rs; struct mbuf *m; uint8_t *frm; uint16_t baparamset; @@ -573,13 +578,11 @@ ieee80211_send_action(struct ieee80211_n break; case IEEE80211_ACTION_CAT_MESHPEERING: addsize += sizeof(uint16_t); /* capabilities */ + addsize += 2 + IEEE80211_RATE_SIZE; + addsize += 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE); addsize += 2 + vap->iv_meshidlen; /* Mesh ID */ addsize += sizeof(struct ieee80211_meshconf_ie); - /* On Open frames, the peer link ID is not sent */ - if (action == IEEE80211_ACTION_MESHPEERING_OPEN) - addsize += sizeof(struct ieee80211_meshpeer_ie) - 2; - else - addsize += sizeof(struct ieee80211_meshpeer_ie); + addsize += sizeof(struct ieee80211_meshpeer_ie); break; } m = ieee80211_getmgtframe(&frm, @@ -657,7 +660,7 @@ ieee80211_send_action(struct ieee80211_n } break; case IEEE80211_ACTION_CAT_MESHPEERING: - + rs = ieee80211_get_suprates(ic, ic->ic_curchan); switch (action) { case IEEE80211_ACTION_MESHPEERING_OPEN: IEEE80211_NOTE(vap, @@ -665,6 +668,8 @@ ieee80211_send_action(struct ieee80211_n "send PEER OPEN action: lid %x", args[0]); *frm++ = 0; /* capabilites */ *frm++ = 0; + frm = ieee80211_add_rates(frm, rs); + frm = ieee80211_add_xrates(frm, rs); frm = ieee80211_add_meshid(frm, vap); frm = ieee80211_add_meshconf(frm, vap); *frm++ = IEEE80211_ELEMID_MESHPEER; @@ -683,6 +688,8 @@ ieee80211_send_action(struct ieee80211_n *frm++ = 0; *frm++ = 0; /* AID */ *frm++ = 0; + frm = ieee80211_add_rates(frm, rs); + frm = ieee80211_add_xrates(frm, rs); frm = ieee80211_add_meshid(frm, vap); frm = ieee80211_add_meshconf(frm, vap); *frm++ = IEEE80211_ELEMID_MESHPEER;