From owner-svn-src-projects@FreeBSD.ORG  Sun Jun 28 16:53:35 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 A0598106567B;
	Sun, 28 Jun 2009 16:53:35 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8EF648FC2E;
	Sun, 28 Jun 2009 16:53:35 +0000 (UTC) (envelope-from sam@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 n5SGrZig016756;
	Sun, 28 Jun 2009 16:53:35 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5SGrZCo016754;
	Sun, 28 Jun 2009 16:53:35 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200906281653.n5SGrZCo016754@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 28 Jun 2009 16:53:35 +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: r195141 - 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 &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Jun 2009 16:53:36 -0000

Author: sam
Date: Sun Jun 28 16:53:35 2009
New Revision: 195141
URL: http://svn.freebsd.org/changeset/base/195141

Log:
  o make struct static to avoid runtime initializer
  o mark another case needing similar fixup

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sun Jun 28 16:51:58 2009	(r195140)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sun Jun 28 16:53:35 2009	(r195141)
@@ -1456,6 +1456,7 @@ ieee80211_add_meshconf(uint8_t *frm, str
 {
 	uint8_t neighs = 0;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
+	/* XXX not static, expensive, do as static+dynamic */
 	struct ieee80211_meshconf_ie ie = {
 		.conf_ie	= IEEE80211_ELEMID_MESHCONF,
 		.conf_len	= sizeof(struct ieee80211_meshconf_ie) - 2,
@@ -1493,7 +1494,7 @@ ieee80211_add_meshconf(uint8_t *frm, str
 uint8_t *
 ieee80211_add_meshpeerver(uint8_t *frm, struct ieee80211vap *vap)
 {
-	struct ieee80211_meshpeerver_ie ie = {
+	static struct ieee80211_meshpeerver_ie ie = {
 		.peerver_ie 	= IEEE80211_ELEMID_MESHPEERVER,
 		.peerver_len 	= 4,
 		.peerver_proto	= IEEE80211_MESHPEERVER_PEER,