From 621953c56b219810b088bf066721acb078cf2d71 Mon Sep 17 00:00:00 2001
From: adrian <adrian@FreeBSD.org>
Date: Wed, 8 Feb 2012 06:56:19 +0000
Subject: [PATCH] Update the 802.11s IE numbers to represent the latest 802.11
 amendment standard.

Submitted by:	monthadar@gmail.com
Reviewed by:	rpaulo
---
 sys/net80211/ieee80211.h | 45 ++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
index b5fde8bea740..39f6d581bada 100644
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -709,27 +709,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 {