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

[Rui Paulo]

Author: rpaulo
Date: Fri Apr 24 11:20:15 2009
New Revision: 191462
URL: http://svn.freebsd.org/changeset/base/191462

Log:
  Parse mesh id IE.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_node.c
  projects/mesh11s/sys/net80211/ieee80211_node.h

Modified: projects/mesh11s/sys/net80211/ieee80211_node.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_node.c	Fri Apr 24 10:31:40 2009	(r191461)
+++ projects/mesh11s/sys/net80211/ieee80211_node.c	Fri Apr 24 11:20:15 2009	(r191462)
@@ -772,6 +772,8 @@ ieee80211_sta_join(struct ieee80211vap *
 		if (ni->ni_ies.tdma_ie != NULL)
 			ieee80211_parse_tdma(ni, ni->ni_ies.tdma_ie);
 #endif
+		if (ni->ni_ies.meshid_ie != NULL)
+			ieee80211_parse_meshid(ni, ni->ni_ies.meshid_ie);
 	}
 
 	vap->iv_dtim_period = se->se_dtimperiod;
@@ -898,6 +900,9 @@ ieee80211_ies_expand(struct ieee80211_ie
 		case IEEE80211_ELEMID_HTCAP:
 			ies->htcap_ie = ie;
 			break;
+		case IEEE80211_ELEMID_MESHID:
+			ies->meshid_ie = ie;
+			break;
 		}
 		ielen -= 2 + ie[1];
 		ie += 2 + ie[1];

Modified: projects/mesh11s/sys/net80211/ieee80211_node.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_node.h	Fri Apr 24 10:31:40 2009	(r191461)
+++ projects/mesh11s/sys/net80211/ieee80211_node.h	Fri Apr 24 11:20:15 2009	(r191462)
@@ -81,6 +81,7 @@ struct ieee80211_ies {
 	uint8_t	*htcap_ie;	/* captured HTCAP ie */
 	uint8_t	*htinfo_ie;	/* captured HTINFO ie */
 	uint8_t	*tdma_ie;	/* captured TDMA ie */
+	uint8_t *meshid_ie;	/* captured MESH ID ie */
 	/* NB: these must be the last members of this structure */
 	uint8_t	*data;		/* frame data > 802.11 header */
 	int	len;		/* data size in bytes */