svn commit: r297008 - head/sys/net80211

[Adrian Chadd]

Author: adrian
Date: Fri Mar 18 04:00:57 2016
New Revision: 297008
URL: https://svnweb.freebsd.org/changeset/base/297008

Log:
  [net80211] IE 127 is not MESHEXTCAP, just EXTCAP.
  
  It's not a mesh extended capabilities; it's just extended capabilities.
  This is from 802.11-2012 8.4.2.29 (Extended Capabilities element.)

Modified:
  head/sys/net80211/ieee80211.h
  head/sys/net80211/ieee80211_input.c

Modified: head/sys/net80211/ieee80211.h
==============================================================================
--- head/sys/net80211/ieee80211.h	Fri Mar 18 03:55:57 2016	(r297007)
+++ head/sys/net80211/ieee80211.h	Fri Mar 18 04:00:57 2016	(r297008)
@@ -877,7 +877,7 @@ enum {
 	IEEE80211_ELEMID_MESHGANN	= 125,
 	IEEE80211_ELEMID_MESHRANN	= 126,
 	/* 127 Extended Capabilities */
-	IEEE80211_ELEMID_MESHEXTCAP	= 127,
+	IEEE80211_ELEMID_EXTCAP		= 127,
 	/* 128-129 reserved */
 	IEEE80211_ELEMID_MESHPREQ	= 130,
 	IEEE80211_ELEMID_MESHPREP	= 131,

Modified: head/sys/net80211/ieee80211_input.c
==============================================================================
--- head/sys/net80211/ieee80211_input.c	Fri Mar 18 03:55:57 2016	(r297007)
+++ head/sys/net80211/ieee80211_input.c	Fri Mar 18 04:00:57 2016	(r297008)
@@ -603,9 +603,10 @@ ieee80211_parse_beacon(struct ieee80211_
 		case IEEE80211_ELEMID_MESHCONF:
 			scan->meshconf = frm;
 			break;
-		case IEEE80211_ELEMID_MESHEXTCAP:
-			break;
 #endif
+		/* Extended capabilities; nothing handles it for now */
+		case IEEE80211_ELEMID_EXTCAP:
+			break;
 		case IEEE80211_ELEMID_VENDOR:
 			if (iswpaoui(frm))
 				scan->wpa = frm;