diff options
| author | Naveen Rawat <naveenrawat@codeaurora.org> | 2016-08-31 16:49:27 -0700 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-09-12 21:46:00 -0700 |
| commit | 02e1266b7080d60f9371e01e460772dd74c7de7e (patch) | |
| tree | 04a975e06bdd9b71ea47c220ede73831f3b74b70 | |
| parent | f660fb4c105aab52a42eafb537be9ad302a6d33d (diff) | |
qcacld-3.0: Send Vendor Specific TPC Report IE in probe request
Send vendor specific TPC report IE as part of scan request IE to firmware.
This IE will then be included in probe request sent by firmware for scan.
Change-Id: I16e067de3980faa773d5027306795ca8e2a3c247
CRs-Fixed: 1062155
| -rw-r--r-- | core/mac/inc/sir_mac_prot_def.h | 4 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_sme_req_messages.c | 28 |
2 files changed, 32 insertions, 0 deletions
diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index 79657e25cdca..abf78f39bea7 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -455,6 +455,10 @@ #define SIR_MAC_CISCO_OUI "\x00\x40\x96" #define SIR_MAC_CISCO_OUI_SIZE 3 +/* WFA vendor specific TPC OUI */ +#define SIR_MAC_WFA_TPC_OUI "\x00\x50\xF2\x08\x00" +#define SIR_MAC_WFA_TPC_OUI_SIZE 5 + /* min size of wme oui header: oui(3) + type + subtype + version */ #define SIR_MAC_OUI_WME_HDR_MIN 6 diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index af91ed2d4027..a5e8d810631b 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -1242,9 +1242,13 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, uint16_t addn_ie_len = 0; uint8_t *vht_cap_ie; uint16_t vht_cap_len = 0; + uint8_t *vendor_tpc_ie; tSirRetStatus status, rc = eSIR_SUCCESS; tDot11fIEExtCap extracted_extcap = {0}; bool extcap_present = true; + uint32_t lim_11h_enable = WNI_CFG_11H_ENABLED_STADEF; + + wlan_cfg_get_int(pMac, WNI_CFG_11H_ENABLED, &lim_11h_enable); if (pScanReq->uIEFieldLen) { status = lim_strip_extcap_update_struct(pMac, @@ -1297,6 +1301,12 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, addn_ie_len += vht_cap_len; } } + + if (lim_11h_enable) { + addn_ie_len += DOT11F_IE_WFATPC_MAX_LEN + 2; + len += DOT11F_IE_WFATPC_MAX_LEN + 2; + } + pScanOffloadReq = qdf_mem_malloc(len); if (NULL == pScanOffloadReq) { lim_log(pMac, LOGE, @@ -1396,6 +1406,24 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, pScanOffloadReq->uIEFieldLen += vht_cap_len; } } + + if (lim_11h_enable) { + tDot11fIEWFATPC wfa_tpc; + vendor_tpc_ie = (uint8_t *) pScanOffloadReq + + pScanOffloadReq->uIEFieldOffset + + pScanOffloadReq->uIEFieldLen; + populate_dot11f_wfatpc(pMac, &wfa_tpc, + rrm_get_mgmt_tx_power(pMac, NULL), 0); + vendor_tpc_ie[0] = DOT11F_EID_WFATPC; + vendor_tpc_ie[1] = DOT11F_IE_WFATPC_MAX_LEN; + qdf_mem_copy(&vendor_tpc_ie[2], SIR_MAC_WFA_TPC_OUI, + SIR_MAC_WFA_TPC_OUI_SIZE); + qdf_mem_copy(&vendor_tpc_ie[SIR_MAC_WFA_TPC_OUI_SIZE + 2], + ((uint8_t *)&wfa_tpc) + 1, + DOT11F_IE_WFATPC_MAX_LEN - SIR_MAC_WFA_TPC_OUI_SIZE); + pScanOffloadReq->uIEFieldLen += DOT11F_IE_WFATPC_MAX_LEN + 2; + } + rc = wma_post_ctrl_msg(pMac, &msg); if (rc != eSIR_SUCCESS) { lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure")); |