svn commit: r239616 - stable/8/sys/net80211

[Bernhard Schmidt]

Author: bschmidt
Date: Thu Aug 23 17:09:58 2012
New Revision: 239616
URL: http://svn.freebsd.org/changeset/base/239616

Log:
  MFC r231187:
  Update the 802.11s IE numbers to represent the latest 802.11 amendment
  standard.
  
  This update breaks compatibility with older mesh setups but is necessary as
  the previous IDs are used by another amendment leading to unexpected results
  when trying to associate with an accesspoint using the affected IDs.
  
  Discussed with:	re
  Tested by:	honestqiao at gmail dot com

Modified:
  stable/8/sys/net80211/ieee80211.h
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/net80211/ieee80211.h
==============================================================================
--- stable/8/sys/net80211/ieee80211.h	Thu Aug 23 17:09:52 2012	(r239615)
+++ stable/8/sys/net80211/ieee80211.h	Thu Aug 23 17:09:58 2012	(r239616)
@@ -708,27 +708,32 @@ enum {
 	IEEE80211_ELEMID_VENDOR		= 221,	/* vendor private */
 
 	/*
-	 * 802.11s IEs based on D3.03 spec and were not assigned by
-	 * ANA. Beware changing them because some of them are being
-	 * kept compatible with Linux.
+	 * 802.11s IEs
+	 * NB: On vanilla Linux still IEEE80211_ELEMID_MESHPEER = 55,
+	 * but they defined a new with id 117 called PEER_MGMT.
+	 * NB: complies with open80211
 	 */
-	IEEE80211_ELEMID_MESHCONF	= 51,
-	IEEE80211_ELEMID_MESHID		= 52,
-	IEEE80211_ELEMID_MESHLINK	= 35,
-	IEEE80211_ELEMID_MESHCNGST	= 36,
-	IEEE80211_ELEMID_MESHPEER	= 55,
-	IEEE80211_ELEMID_MESHCSA	= 38,
-	IEEE80211_ELEMID_MESHTIM	= 39,
-	IEEE80211_ELEMID_MESHAWAKEW	= 40,
-	IEEE80211_ELEMID_MESHBEACONT	= 41,
-	IEEE80211_ELEMID_MESHPANN	= 48,
-	IEEE80211_ELEMID_MESHRANN	= 49,
-	IEEE80211_ELEMID_MESHPREQ	= 68,
-	IEEE80211_ELEMID_MESHPREP	= 69,
-	IEEE80211_ELEMID_MESHPERR	= 70,
-	IEEE80211_ELEMID_MESHPXU	= 53,
-	IEEE80211_ELEMID_MESHPXUC	= 54,
-	IEEE80211_ELEMID_MESHAH		= 60, /* Abbreviated Handshake */
+	IEEE80211_ELEMID_MESHCONF	= 113,
+	IEEE80211_ELEMID_MESHID		= 114,
+	IEEE80211_ELEMID_MESHLINK	= 115,
+	IEEE80211_ELEMID_MESHCNGST	= 116,
+	IEEE80211_ELEMID_MESHPEER	= 117,
+	IEEE80211_ELEMID_MESHCSA	= 118,
+	IEEE80211_ELEMID_MESHTIM	= 39, /* XXX: remove */
+	IEEE80211_ELEMID_MESHAWAKEW	= 119,
+	IEEE80211_ELEMID_MESHBEACONT	= 120,
+	/* 121-124 MMCAOP not implemented yet */
+	IEEE80211_ELEMID_MESHPANN	= 125, /* XXX: is GANN now, not used */
+	IEEE80211_ELEMID_MESHRANN	= 126,
+	/* 127 Extended Capabilities */
+	/* 128-129 reserved */
+	IEEE80211_ELEMID_MESHPREQ	= 130,
+	IEEE80211_ELEMID_MESHPREP	= 131,
+	IEEE80211_ELEMID_MESHPERR	= 132,
+	/* 133-136 reserved */
+	IEEE80211_ELEMID_MESHPXU	= 137,
+	IEEE80211_ELEMID_MESHPXUC	= 138,
+	IEEE80211_ELEMID_MESHAH		= 60, /* XXX: remove */
 };
 
 struct ieee80211_tim_ie {