From b5d426d68393da43733e4cde8178cde1f792b819 Mon Sep 17 00:00:00 2001 From: Gyanranjan Hazarika Date: Tue, 22 Aug 2017 21:45:07 -0700 Subject: [PATCH] qcacmn: D1.3 support - Code changes for Ie-Id, Length and IE-Id Ext D1.3 defines the IE Id, Length and IE ID Extension for HE CAP and HE OP. Host changes to accommodate them. Change-Id: Idc3848b5486d05807cdc2ca3fb45ac493243558e CRs-fixed: 2095550 --- .../cmn_defs/inc/wlan_cmn_ieee80211.h | 6 +++++- umac/scan/dispatcher/src/wlan_scan_utils_api.c | 15 +++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h b/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h index 8a3e09c43e63..9cb76eac6b8a 100644 --- a/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h +++ b/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h @@ -319,9 +319,13 @@ enum element_ie { /** * enum extn_element_ie :- extended management information element - * @WLAN_EXTN_ELEMID_SRP: spatial reuse parameter IE + * @WLAN_EXTN_ELEMID_HECAP: HE capabilites IE + * @WLAN_EXTN_ELEMID_HEOP: HE Operation IE + * @WLAN_EXTN_ELEMID_SRP: spatial reuse parameter IE */ enum extn_element_ie { + WLAN_EXTN_ELEMID_HECAP = 35, + WLAN_EXTN_ELEMID_HEOP = 36, WLAN_EXTN_ELEMID_SRP = 39, }; diff --git a/umac/scan/dispatcher/src/wlan_scan_utils_api.c b/umac/scan/dispatcher/src/wlan_scan_utils_api.c index 83837693e152..48a2f73c5726 100644 --- a/umac/scan/dispatcher/src/wlan_scan_utils_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_utils_api.c @@ -349,7 +349,13 @@ util_scan_parse_extn_ie(struct scan_cache_entry *scan_params, switch (extn_ie->ie_extn_id) { case WLAN_EXTN_ELEMID_SRP: - scan_params->ie_list.srp = (uint8_t *)ie; + scan_params->ie_list.srp = (uint8_t *)ie; + break; + case WLAN_EXTN_ELEMID_HECAP: + scan_params->ie_list.hecap = (uint8_t *)ie; + break; + case WLAN_EXTN_ELEMID_HEOP: + scan_params->ie_list.heop = (uint8_t *)ie; break; default: break; @@ -408,14 +414,7 @@ util_scan_parse_vendor_ie(struct scan_cache_entry *scan_params, * hence copy data just after version byte */ scan_params->ie_list.bwnss_map = (((uint8_t *)ie) + 8); - } else if (is_he_cap_oui(((uint8_t *)(ie))) && - !(scan_params->ie_list.hecap)) { - scan_params->ie_list.hecap = (uint8_t *)ie; - } else if (is_he_op_oui(((uint8_t *)(ie))) && - !(scan_params->ie_list.heop)) { - scan_params->ie_list.heop = (uint8_t *)ie; } - } static QDF_STATUS