svn commit: r191470 - projects/mesh11s/sys/net80211

[Rui Paulo]

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;