From owner-svn-src-projects@FreeBSD.ORG Mon Apr 27 18:59:40 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 C39C1106567C; Mon, 27 Apr 2009 18:59:40 +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 B1D988FC27; Mon, 27 Apr 2009 18:59:40 +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 n3RIxe7e023617; Mon, 27 Apr 2009 18:59:40 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3RIxePs023616; Mon, 27 Apr 2009 18:59:40 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904271859.n3RIxePs023616@svn.freebsd.org> From: Rui Paulo Date: Mon, 27 Apr 2009 18:59:40 +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: r191585 - 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: Mon, 27 Apr 2009 18:59:41 -0000 Author: rpaulo Date: Mon Apr 27 18:59:40 2009 New Revision: 191585 URL: http://svn.freebsd.org/changeset/base/191585 Log: Append Mesh Configuration IE on probe responses and beacons. 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 Mon Apr 27 18:55:22 2009 (r191584) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Mon Apr 27 18:59:40 2009 (r191585) @@ -2058,7 +2058,7 @@ ieee80211_alloc_proberesp(struct ieee802 + sizeof(struct ieee80211_ath_ie) #endif + 2 + IEEE80211_MESHID_LEN - /* + sizeof(struct ieee80211_meshconf_ie) */ + + sizeof(struct ieee80211_meshconf_ie) + (vap->iv_appie_proberesp != NULL ? vap->iv_appie_proberesp->ie_len : 0) ); @@ -2454,7 +2454,7 @@ ieee80211_beacon_construct(struct mbuf * } if (vap->iv_opmode == IEEE80211_M_MBSS) { frm = ieee80211_add_meshid(frm, vap); - /* frm = ieee80211_add_meshconf(frm, vap); */ + frm = ieee80211_add_meshconf(frm, vap); /* struct ieee80211_tim_ie *tie = (struct ieee80211_tim_ie *) frm; tie->tim_ie = IEEE80211_ELEMID_TIM; tie->tim_len = 4; * length * @@ -2543,8 +2543,8 @@ ieee80211_beacon_alloc(struct ieee80211_ #endif + (vap->iv_opmode == IEEE80211_M_MBSS ? 2 + ni->ni_meshidlen : 0) - /* + (vap->iv_opmode == IEEE80211_M_MBSS ? - sizeof(struct ieee80211_meshconf_ie) : 0) */ + + (vap->iv_opmode == IEEE80211_M_MBSS ? + sizeof(struct ieee80211_meshconf_ie) : 0) + IEEE80211_MAX_APPIE ; m = ieee80211_getmgtframe(&frm,