Browse Source

qcacmn: Remove unused structure while sending probe resp template

While sending probe response template down to firmware, driver
populates some items in data-structure which is not getting used.

Remove those unused items and send only what is needed.

CRs-Fixed: 2130437
Change-Id: I1878f523f0f88c354854dfdb75e60e66c4ecb0e8
Krunal Soni 7 years ago
parent
commit
6be39c17e9

+ 1 - 2
wmi/inc/wmi_unified_api.h

@@ -592,8 +592,7 @@ QDF_STATUS wmi_unified_process_update_edca_param(void *wmi_hdl,
 
 QDF_STATUS wmi_unified_probe_rsp_tmpl_send_cmd(void *wmi_hdl,
 		   uint8_t vdev_id,
-		   struct wmi_probe_resp_params *probe_rsp_info,
-		   uint8_t *frm);
+		   struct wmi_probe_resp_params *probe_rsp_info);
 
 QDF_STATUS wmi_unified_setup_install_key_cmd(void *wmi_hdl,
 			struct set_key_params *key_params);

+ 4 - 8
wmi/inc/wmi_unified_param.h

@@ -1799,16 +1799,12 @@ struct wmi_gtx_config {
 
 /**
  * struct wmi_probe_resp_params - send probe response parameters
- * @bssId: BSSID
- * @pProbeRespTemplate: probe response template
- * @probeRespTemplateLen: probe response template length
- * @ucProxyProbeReqValidIEBmap: valid IE bitmap
+ * @prb_rsp_template_frm: pointer to template probe response template
+ * @prb_rsp_template_len: length of probe response template
  */
 struct wmi_probe_resp_params {
-	uint8_t  bssId[IEEE80211_ADDR_LEN];
-	uint8_t *pProbeRespTemplate;
-	uint32_t probeRespTemplateLen;
-	uint32_t ucProxyProbeReqValidIEBmap[8];
+	uint8_t *prb_rsp_template_frm;
+	uint32_t prb_rsp_template_len;
 };
 
 /* struct set_key_params: structure containing

+ 1 - 2
wmi/inc/wmi_unified_priv.h

@@ -385,8 +385,7 @@ QDF_STATUS (*send_p2p_go_set_beacon_ie_cmd)(wmi_unified_t wmi_handle,
 
 QDF_STATUS (*send_probe_rsp_tmpl_send_cmd)(wmi_unified_t wmi_handle,
 			     uint8_t vdev_id,
-			     struct wmi_probe_resp_params *probe_rsp_info,
-			     uint8_t *frm);
+			     struct wmi_probe_resp_params *probe_rsp_info);
 
 QDF_STATUS (*send_setup_install_key_cmd)(wmi_unified_t wmi_handle,
 				struct set_key_params *key_params);

+ 2 - 4
wmi/src/wmi_unified_api.c

@@ -1490,15 +1490,13 @@ QDF_STATUS wmi_unified_process_update_edca_param(void *wmi_hdl,
  */
 QDF_STATUS wmi_unified_probe_rsp_tmpl_send_cmd(void *wmi_hdl,
 				uint8_t vdev_id,
-				struct wmi_probe_resp_params *probe_rsp_info,
-				uint8_t *frm)
+				struct wmi_probe_resp_params *probe_rsp_info)
 {
 	wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
 
 	if (wmi_handle->ops->send_probe_rsp_tmpl_send_cmd)
 		return wmi_handle->ops->send_probe_rsp_tmpl_send_cmd(wmi_handle,
-						 vdev_id, probe_rsp_info,
-						 frm);
+						 vdev_id, probe_rsp_info);
 
 	return QDF_STATUS_E_FAILURE;
 }

+ 3 - 4
wmi/src/wmi_unified_tlv.c

@@ -4887,8 +4887,7 @@ fail:
  */
 static QDF_STATUS send_probe_rsp_tmpl_send_cmd_tlv(wmi_unified_t wmi_handle,
 				   uint8_t vdev_id,
-				   struct wmi_probe_resp_params *probe_rsp_info,
-				   uint8_t *frm)
+				   struct wmi_probe_resp_params *probe_rsp_info)
 {
 	wmi_prb_tmpl_cmd_fixed_param *cmd;
 	wmi_bcn_prb_info *bcn_prb_info;
@@ -4899,7 +4898,7 @@ static QDF_STATUS send_probe_rsp_tmpl_send_cmd_tlv(wmi_unified_t wmi_handle,
 
 	WMI_LOGD(FL("Send probe response template for vdev %d"), vdev_id);
 
-	tmpl_len = probe_rsp_info->probeRespTemplateLen;
+	tmpl_len = probe_rsp_info->prb_rsp_template_len;
 	tmpl_len_aligned = roundup(tmpl_len, sizeof(A_UINT32));
 
 	wmi_buf_len = sizeof(wmi_prb_tmpl_cmd_fixed_param) +
@@ -4938,7 +4937,7 @@ static QDF_STATUS send_probe_rsp_tmpl_send_cmd_tlv(wmi_unified_t wmi_handle,
 
 	WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, tmpl_len_aligned);
 	buf_ptr += WMI_TLV_HDR_SIZE;
-	qdf_mem_copy(buf_ptr, frm, tmpl_len);
+	qdf_mem_copy(buf_ptr, probe_rsp_info->prb_rsp_template_frm, tmpl_len);
 
 	ret = wmi_unified_cmd_send(wmi_handle,
 				   wmi_buf, wmi_buf_len, WMI_PRB_TMPL_CMDID);