Browse Source

qcacld-3.0: Replace tHalHandle references in LIM

The LIM code should deal exclusively with the "real" MAC context, so
replace references to the opaque handle tHalHandle with references to
the actual underlying struct.

Change-Id: I2801f6531d810710d6ec0fdbd517d30f85407c25
CRs-Fixed: 2347928
Jeff Johnson 6 years ago
parent
commit
59429b0b5c
2 changed files with 9 additions and 12 deletions
  1. 3 6
      core/mac/src/pe/lim/lim_api.c
  2. 6 6
      core/mac/src/pe/lim/lim_send_management_frames.c

+ 3 - 6
core/mac/src/pe/lim/lim_api.c

@@ -566,19 +566,16 @@ void lim_cleanup(tpAniSirGlobal pMac)
  */
 static void lim_state_info_dump(char **buf_ptr, uint16_t *size)
 {
-	tHalHandle hal;
-	tpAniSirGlobal mac;
+	struct mac_context *mac;
 	uint16_t len = 0;
 	char *buf = *buf_ptr;
 
-	hal = cds_get_context(QDF_MODULE_ID_PE);
-	if (hal == NULL) {
+	mac = cds_get_context(QDF_MODULE_ID_PE);
+	if (!mac) {
 		QDF_ASSERT(0);
 		return;
 	}
 
-	mac = PMAC_STRUCT(hal);
-
 	pe_debug("size of buffer: %d", *size);
 
 	len += qdf_scnprintf(buf + len, *size - len,

+ 6 - 6
core/mac/src/pe/lim/lim_send_management_frames.c

@@ -839,12 +839,12 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 		tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 
 	/* Queue Probe Response frame in high priority WQ */
-	qdf_status = wma_tx_frame((tHalHandle) mac_ctx, packet,
-				(uint16_t) bytes,
-				TXRX_FRM_802_11_MGMT,
-				ANI_TXDIR_TODS,
-				7, lim_tx_complete, frame, tx_flag,
-				sme_sessionid, 0, RATEID_DEFAULT);
+	qdf_status = wma_tx_frame(mac_ctx, packet,
+				  (uint16_t)bytes,
+				  TXRX_FRM_802_11_MGMT,
+				  ANI_TXDIR_TODS,
+				  7, lim_tx_complete, frame, tx_flag,
+				  sme_sessionid, 0, RATEID_DEFAULT);
 
 	/* Pkt will be freed up by the callback */
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))