qcacld-3.0: Remove usage of sta_id in get SNR path

Currently driver passes sta_id through out the call for getting the SNR
stats. Although passed, the sta_id is not used anywhere in the call
stack. As part of removing the sta_id usage, this sta_id can also be
removed safely.

Remove the usage of sta_id in get SNR stats path.

Change-Id: I39482d8f6d8e3bd32e940a85d5592dada8f0460b
CRs-Fixed: 2503956

core/hdd/src/wlan_hdd_stats.c

@@ -5293,7 +5293,7 @@ struct snr_priv {
  *
  * Return: None
  */
-static void hdd_get_snr_cb(int8_t snr, uint32_t sta_id, void *context)
+static void hdd_get_snr_cb(int8_t snr, void *context)
 {
 	struct osif_request *request;
 	struct snr_priv *priv;
@@ -5348,7 +5348,6 @@ QDF_STATUS wlan_hdd_get_snr(struct hdd_adapter *adapter, int8_t *snr)
 	cookie = osif_request_cookie(request);
 
 	status = sme_get_snr(hdd_ctx->mac_handle, hdd_get_snr_cb,
-			     sta_ctx->conn_info.sta_id[0],
 			     sta_ctx->conn_info.bssid, cookie);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Unable to retrieve RSSI");

core/mac/inc/sir_api.h

@@ -1376,7 +1376,6 @@ typedef struct sAniGetSnrReq {
 	uint16_t msgType;       /* message type is same as the request type */
 	uint16_t msgLen;        /* length of the entire request */
 	uint8_t sessionId;
-	uint8_t staId;
 	void *snrCallback;
 	void *pDevContext;      /* device context */
 	int8_t snr;

core/sme/inc/csr_api.h

@@ -1425,7 +1425,7 @@ const char *csr_phy_mode_str(eCsrPhyMode phy_mode);
 typedef void (*tCsrTsmStatsCallback)(tAniTrafStrmMetrics tsmMetrics,
 				     uint32_t staId, void *pContext);
 #endif /* FEATURE_WLAN_ESE */
-typedef void (*tCsrSnrCallback)(int8_t snr, uint32_t staId, void *pContext);
+typedef void (*tCsrSnrCallback)(int8_t snr, void *pContext);
 
 /**
  * csr_roam_issue_ft_preauth_req() - Initiate Preauthentication request

core/sme/inc/csr_internal.h

@@ -898,7 +898,7 @@ bool csr_is_valid_mc_concurrent_session(struct mac_context *mac,
 bool csr_is_conn_state_connected_infra_ap(struct mac_context *mac,
 		uint32_t sessionId);
 QDF_STATUS csr_get_snr(struct mac_context *mac, tCsrSnrCallback callback,
-		uint8_t staId, struct qdf_mac_addr bssId, void *pContext);
+			  struct qdf_mac_addr bssId, void *pContext);
 QDF_STATUS csr_get_config_param(struct mac_context *mac,
 					  struct csr_config_params *pParam);
 QDF_STATUS csr_change_default_config_param(struct mac_context *mac,

core/sme/inc/sme_api.h

@@ -586,8 +586,8 @@ QDF_STATUS sme_roam_get_wpa_rsn_rsp_ie(mac_handle_t mac_handle,
 QDF_STATUS sme_get_config_param(mac_handle_t mac_handle,
 				struct sme_config_params *pParam);
 QDF_STATUS sme_get_snr(mac_handle_t mac_handle,
-		tCsrSnrCallback callback,
-		uint8_t staId, struct qdf_mac_addr bssId, void *pContext);
+		       tCsrSnrCallback callback,
+		       struct qdf_mac_addr bssId, void *pContext);
 #ifdef FEATURE_WLAN_ESE
 QDF_STATUS sme_get_tsm_stats(mac_handle_t mac_handle,
 		tCsrTsmStatsCallback callback,

core/sme/src/common/sme_api.c

@@ -2142,9 +2142,8 @@ QDF_STATUS sme_process_msg(struct mac_context *mac, struct scheduler_msg *pMsg)
 		if (pSnrReq) {
 			if (pSnrReq->snrCallback) {
 				((tCsrSnrCallback)
-				 (pSnrReq->snrCallback))
-					(pSnrReq->snr, pSnrReq->staId,
-					pSnrReq->pDevContext);
+				 (pSnrReq->snrCallback))(pSnrReq->snr,
+							 pSnrReq->pDevContext);
 			}
 			qdf_mem_free(pSnrReq);
 		}
@@ -3484,14 +3483,14 @@ QDF_STATUS sme_roam_set_default_key_index(mac_handle_t mac_handle,
  */
 QDF_STATUS sme_get_snr(mac_handle_t mac_handle,
 		       tCsrSnrCallback callback,
-		       uint8_t staId, struct qdf_mac_addr bssId, void *pContext)
+		       struct qdf_mac_addr bssId, void *pContext)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	struct mac_context *mac = MAC_CONTEXT(mac_handle);
 
 	status = sme_acquire_global_lock(&mac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		status = csr_get_snr(mac, callback, staId, bssId, pContext);
+		status = csr_get_snr(mac, callback, bssId, pContext);
 		sme_release_global_lock(&mac->sme);
 	}
 	return status;

core/sme/src/csr/csr_api_roam.c

@@ -17394,7 +17394,7 @@ static void csr_roam_link_down(struct mac_context *mac, uint32_t sessionId)
 
 QDF_STATUS csr_get_snr(struct mac_context *mac,
 		       tCsrSnrCallback callback,
-		       uint8_t staId, struct qdf_mac_addr bssId, void *pContext)
+		       struct qdf_mac_addr bssId, void *pContext)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct scheduler_msg msg = {0};
@@ -17415,7 +17415,6 @@ QDF_STATUS csr_get_snr(struct mac_context *mac,
 	pMsg->msgType = eWNI_SME_GET_SNR_REQ;
 	pMsg->msgLen = (uint16_t) sizeof(tAniGetSnrReq);
 	pMsg->sessionId = sessionId;
-	pMsg->staId = staId;
 	pMsg->snrCallback = callback;
 	pMsg->pDevContext = pContext;
 	msg.type = eWNI_SME_GET_SNR_REQ;

core/wma/src/wma_features.c

@@ -222,7 +222,6 @@ QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req)
 		return QDF_STATUS_E_NOMEM;
 
 	qdf_mem_zero(psnr_req_bkp, sizeof(tAniGetSnrReq));
-	psnr_req_bkp->staId = psnr_req->staId;
 	psnr_req_bkp->pDevContext = psnr_req->pDevContext;
 	psnr_req_bkp->snrCallback = psnr_req->snrCallback;
 	intr->psnr_req = (void *)psnr_req_bkp;