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

[Rui Paulo]

Author: rpaulo
Date: Fri Jul 10 11:00:52 2009
New Revision: 195542
URL: http://svn.freebsd.org/changeset/base/195542

Log:
  Replace ms_idlen with IEEE80211_MESHID_LEN.
  
  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 Jul 10 10:56:26 2009	(r195541)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul 10 11:00:52 2009	(r195542)
@@ -1700,7 +1700,7 @@ mesh_send_action_meshpeering_open(struct
 	    + sizeof(struct ieee80211_meshpeerver_ie)	 
 	    + 2 + IEEE80211_RATE_SIZE	 
 	    + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE)	 
-	    + 2 + ms->ms_idlen              /* Mesh ID */	 
+	    + 2 + IEEE80211_MESHID_LEN
 	    + sizeof(struct ieee80211_meshconf_ie)	 
 	    + sizeof(struct ieee80211_meshpeer_ie)
 	);
@@ -1767,7 +1767,7 @@ mesh_send_action_meshpeering_confirm(str
 	    + sizeof(struct ieee80211_meshpeerver_ie)	 
 	    + 2 + IEEE80211_RATE_SIZE	 
 	    + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE)	 
-	    + 2 + ms->ms_idlen              /* Mesh ID */	 
+	    + 2 + IEEE80211_MESHID_LEN
 	    + sizeof(struct ieee80211_meshconf_ie)	 
 	    + sizeof(struct ieee80211_meshpeer_ie)
 	);
@@ -1834,7 +1834,7 @@ mesh_send_action_meshpeering_close(struc
 	    sizeof(uint16_t)	/* action+category */
 	    + sizeof(uint16_t)	/* reason code */
 	    + sizeof(struct ieee80211_meshpeerver_ie)
-	    + 2 + ms->ms_idlen              /* Mesh ID */	 
+	    + 2 + IEEE80211_MESHID_LEN
 	    + sizeof(struct ieee80211_meshpeer_ie) 
 	);
 	if (m != NULL) {