diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2010-06-14 15:37:48 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2010-06-14 15:37:48 +0000 |
| commit | ce9c8f380b1fae326c166456a15ae504dce5c1d1 (patch) | |
| tree | 14bf596282a14863f779d075d7a8f7e60c25f0a8 /contrib/wpa/src/common/ieee802_11_common.c | |
| parent | da0290f8d3606ed387adb04fec5d24de81a39032 (diff) | |
| parent | 60c44471bf25f9e84d8701afe1bbcbcc88e18c89 (diff) | |
| download | FreeBSD-src-ce9c8f380b1fae326c166456a15ae504dce5c1d1.zip FreeBSD-src-ce9c8f380b1fae326c166456a15ae504dce5c1d1.tar.gz | |
MFV hostapd & wpa_supplicant 0.6.10.
Diffstat (limited to 'contrib/wpa/src/common/ieee802_11_common.c')
| -rw-r--r-- | contrib/wpa/src/common/ieee802_11_common.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/contrib/wpa/src/common/ieee802_11_common.c b/contrib/wpa/src/common/ieee802_11_common.c index 991c989..242f933 100644 --- a/contrib/wpa/src/common/ieee802_11_common.c +++ b/contrib/wpa/src/common/ieee802_11_common.c @@ -49,26 +49,33 @@ static int ieee802_11_parse_vendor_specific(u8 *pos, size_t elen, elems->wpa_ie = pos; elems->wpa_ie_len = elen; break; - case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */ + case WMM_OUI_TYPE: + /* WMM information element */ if (elen < 5) { - wpa_printf(MSG_MSGDUMP, "short WME " + wpa_printf(MSG_MSGDUMP, "short WMM " "information element ignored " "(len=%lu)", (unsigned long) elen); return -1; } switch (pos[4]) { - case WME_OUI_SUBTYPE_INFORMATION_ELEMENT: - case WME_OUI_SUBTYPE_PARAMETER_ELEMENT: - elems->wme = pos; - elems->wme_len = elen; + case WMM_OUI_SUBTYPE_INFORMATION_ELEMENT: + case WMM_OUI_SUBTYPE_PARAMETER_ELEMENT: + /* + * Share same pointer since only one of these + * is used and they start with same data. + * Length field can be used to distinguish the + * IEs. + */ + elems->wmm = pos; + elems->wmm_len = elen; break; - case WME_OUI_SUBTYPE_TSPEC_ELEMENT: - elems->wme_tspec = pos; - elems->wme_tspec_len = elen; + case WMM_OUI_SUBTYPE_TSPEC_ELEMENT: + elems->wmm_tspec = pos; + elems->wmm_tspec_len = elen; break; default: - wpa_printf(MSG_MSGDUMP, "unknown WME " + wpa_printf(MSG_MSGDUMP, "unknown WMM " "information element ignored " "(subtype=%d len=%lu)", pos[4], (unsigned long) elen); |
