From f3e24d74a7c7695557c6cb1e10671cff4f9baa58 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Fri, 18 Mar 2016 04:00:57 +0000 Subject: [PATCH] [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.) --- sys/net80211/ieee80211.h | 2 +- sys/net80211/ieee80211_input.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index 00580b1ad16a..d813e89eb49c 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -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, diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 3b4379f3371e..5c2f9e597521 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -603,9 +603,10 @@ ieee80211_parse_beacon(struct ieee80211_node *ni, struct mbuf *m, 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;