qcacld-3.0: Do not sent TPC IE in addition scan IE to firmware

Scan flags WMI_SCAN_ADD_TPC_IE_IN_PROBE_REQ included in scan request will
trigger firmware probe request to include TPC IE, hence do not include TPC
IE in additional scan IEs sent from host.

Change-Id: I490d978d8a90b13f779c1e3a77a7bd16b9bd8b99
CRs-Fixed: 1088639

core/mac/inc/sir_mac_prot_def.h

@@ -455,10 +455,6 @@
 #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
 

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -1229,13 +1229,9 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
 	tSirMsgQ msg;
 	uint16_t i, len;
 	uint16_t addn_ie_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,
@@ -1266,10 +1262,6 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
 	len = sizeof(tSirScanOffloadReq) +
 		(pScanReq->channelList.numChannels - 1) +
 		pScanReq->uIEFieldLen;
-	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) {
@@ -1342,30 +1334,6 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
 		     (uint8_t *) pScanReq + pScanReq->uIEFieldOffset,
 		     pScanReq->uIEFieldLen);
 
-	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;
-		if (pScanReq->uIEFieldLen)
-			lim_strip_ie(pMac,
-				(uint8_t *) pScanReq + pScanReq->uIEFieldOffset,
-				&pScanReq->uIEFieldLen,
-				DOT11F_EID_WFATPC, ONE_BYTE,
-				SIR_MAC_WFA_TPC_OUI, SIR_MAC_WFA_TPC_OUI_SIZE,
-				NULL);
-	}
-
 	rc = wma_post_ctrl_msg(pMac, &msg);
 	if (rc != eSIR_SUCCESS) {
 		lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure"));