From owner-svn-src-head@freebsd.org  Fri Mar 18 04:00:59 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47C1AAD42FC;
 Fri, 18 Mar 2016 04:00:59 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 195D08CD;
 Fri, 18 Mar 2016 04:00:59 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2I40wJp085817;
 Fri, 18 Mar 2016 04:00:58 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2I40w91085815;
 Fri, 18 Mar 2016 04:00:58 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201603180400.u2I40w91085815@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 18 Mar 2016 04:00:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297008 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Mar 2016 04:00:59 -0000

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;