From owner-svn-src-projects@FreeBSD.ORG  Fri Apr 24 18:39:11 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 B9EEE106566B;
	Fri, 24 Apr 2009 18:39:11 +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 A91AB8FC24;
	Fri, 24 Apr 2009 18:39:11 +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 n3OIdBiP029388;
	Fri, 24 Apr 2009 18:39:11 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OIdBAp029387;
	Fri, 24 Apr 2009 18:39:11 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904241839.n3OIdBAp029387@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 24 Apr 2009 18:39:11 +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: r191470 - 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: Fri, 24 Apr 2009 18:39:12 -0000

Author: rpaulo
Date: Fri Apr 24 18:39:11 2009
New Revision: 191470
URL: http://svn.freebsd.org/changeset/base/191470

Log:
  Simplify add_meshid().
  
  Discussed with:	sam
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Apr 24 17:28:12 2009	(r191469)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Apr 24 18:39:11 2009	(r191470)
@@ -395,17 +395,12 @@ ieee80211_parse_meshid(struct ieee80211_
 uint8_t *
 ieee80211_add_meshid(uint8_t *frm, struct ieee80211vap *vap)
 {
-	struct ieee80211_meshid_ie ie = {
-		.id_ie	= IEEE80211_ELEMID_MESHID,
-		.id_len	= sizeof(struct ieee80211_meshid_ie) +
-		    vap->iv_meshidlen,
-	};
 
 	KASSERT(vap->iv_caps & IEEE80211_C_MBSS,
 	     ("not a mbss vap, caps 0x%x", vap->iv_caps));
 
-	memcpy(frm, &ie, sizeof(ie));
-	frm += sizeof(struct ieee80211_meshid_ie);
+	*frm++ = IEEE80211_ELEMID_MESHID;
+	*frm++ = sizeof(struct ieee80211_meshid_ie) + vap->iv_meshidlen;
 	memcpy(frm, vap->iv_meshid, vap->iv_meshidlen);
 	frm += vap->iv_meshidlen;