diff options
| author | adrian <adrian@FreeBSD.org> | 2016-03-18 04:00:57 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2016-03-18 04:00:57 +0000 |
| commit | 07ff8741cf967275bb63638cd9b32c9b3a2e8722 (patch) | |
| tree | 4f2652d46271d8d74069334a25f0c45335846215 /sys/net80211 | |
| parent | 08bc03ce8e1452fea8b564e81c986ff34de76fe7 (diff) | |
| download | FreeBSD-src-07ff8741cf967275bb63638cd9b32c9b3a2e8722.zip FreeBSD-src-07ff8741cf967275bb63638cd9b32c9b3a2e8722.tar.gz | |
[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.)
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211.h | 2 | ||||
| -rw-r--r-- | 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 00580b1..d813e89 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 3b4379f..5c2f9e5 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; |
