qcacld-3.0: Remove legacy get rssi command implementation
Driver has a stats infrastructure and all the stats related
commands are using this infrastructure.
Remove legacy implementation for get rssi command as part
of cleanup.
Change-Id: I7a837d780c6a1551db0929e6ec7e73daaf479429
CRs-Fixed: 2480770
diff --git a/core/hdd/src/wlan_hdd_hostapd_wext.c b/core/hdd/src/wlan_hdd_hostapd_wext.c
index aa21544..014fa79 100644
--- a/core/hdd/src/wlan_hdd_hostapd_wext.c
+++ b/core/hdd/src/wlan_hdd_hostapd_wext.c
@@ -2552,12 +2552,11 @@
* @wrqu: iwpriv command parameter
* @extra
*
- * This function will call wlan_hdd_get_peer_rssi
+ * This function will call wlan_cfg80211_mc_cp_stats_get_peer_rssi
* to get rssi
*
* Return: 0 on success, otherwise error value
*/
-#ifdef QCA_SUPPORT_CP_STATS
static int
__iw_get_peer_rssi(struct net_device *dev, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
@@ -2620,84 +2619,6 @@
return 0;
}
-#else
-static int
-__iw_get_peer_rssi(struct net_device *dev, struct iw_request_info *info,
- union iwreq_data *wrqu, char *extra)
-{
- struct hdd_adapter *adapter = netdev_priv(dev);
- struct hdd_context *hddctx;
- char macaddrarray[MAC_ADDRESS_STR_LEN];
- struct qdf_mac_addr macaddress = QDF_MAC_ADDR_BCAST_INIT;
- int ret;
- char *rssi_info_output = extra;
- struct sir_peer_sta_info peer_sta_info;
- struct sir_peer_info *rssi_info;
- int i;
- int buf;
- int length;
-
- hdd_enter();
-
- hddctx = WLAN_HDD_GET_CTX(adapter);
- ret = wlan_hdd_validate_context(hddctx);
- if (ret != 0)
- return ret;
-
- ret = hdd_check_private_wext_control(hddctx, info);
- if (0 != ret)
- return ret;
-
- hdd_debug("wrqu->data.length= %d", wrqu->data.length);
-
- if (wrqu->data.length >= MAC_ADDRESS_STR_LEN - 1) {
- if (copy_from_user(macaddrarray,
- wrqu->data.pointer,
- MAC_ADDRESS_STR_LEN - 1)) {
- hdd_info("failed to copy data from user buffer");
- return -EFAULT;
- }
-
- macaddrarray[MAC_ADDRESS_STR_LEN - 1] = '\0';
- hdd_debug("%s", macaddrarray);
-
- if (!mac_pton(macaddrarray, macaddress.bytes))
- hdd_err("String to Hex conversion Failed");
- }
-
- ret = wlan_hdd_get_peer_rssi(adapter, &macaddress, &peer_sta_info);
- if (ret) {
- hdd_err("Unable to retrieve peer rssi: %d", ret);
- return ret;
- }
- /*
- * The iwpriv tool default print is before mac addr and rssi.
- * Add '\n' before first rssi item to align the first rssi item
- * with others
- *
- * wlan getRSSI:
- * [macaddr1] [rssi1]
- * [macaddr2] [rssi2]
- * [macaddr3] [rssi3]
- */
- length = scnprintf(rssi_info_output, WE_MAX_STR_LEN, "\n");
- rssi_info = &peer_sta_info.info[0];
- for (i = 0; i < peer_sta_info.sta_num; i++) {
- buf = scnprintf
- (
- rssi_info_output + length, WE_MAX_STR_LEN - length,
- "[%pM] [%d]\n",
- rssi_info[i].peer_macaddr.bytes,
- rssi_info[i].rssi
- );
- length += buf;
- }
- wrqu->data.length = length + 1;
- hdd_exit();
-
- return 0;
-}
-#endif
/**
* iw_get_peer_rssi() - get station's rssi
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index e9d8014..ad89fb6 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -5189,7 +5189,6 @@
return status;
}
-#ifdef QCA_SUPPORT_CP_STATS
QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
{
int ret = 0, i;
@@ -5247,131 +5246,6 @@
hdd_err("bss peer not present in returned result");
return QDF_STATUS_E_FAULT;
}
-#else /* QCA_SUPPORT_CP_STATS */
-struct rssi_priv {
- int8_t rssi;
-};
-
-/**
- * hdd_get_rssi_cb() - "Get RSSI" callback function
- * @rssi: Current RSSI of the station
- * @sta_id: ID of the station
- * @context: opaque context originally passed to SME. HDD always passes
- * a cookie for the request context
- *
- * Return: None
- */
-static void hdd_get_rssi_cb(int8_t rssi, uint32_t sta_id, void *context)
-{
- struct osif_request *request;
- struct rssi_priv *priv;
-
- request = osif_request_get(context);
- if (!request) {
- hdd_err("Obsolete request");
- return;
- }
-
- priv = osif_request_priv(request);
- priv->rssi = rssi;
- osif_request_complete(request);
- osif_request_put(request);
-}
-
-QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
-{
- struct hdd_context *hdd_ctx;
- struct hdd_station_ctx *sta_ctx;
- QDF_STATUS status;
- int ret;
- void *cookie;
- struct osif_request *request;
- struct rssi_priv *priv;
- static const struct osif_request_params params = {
- .priv_size = sizeof(*priv),
- .timeout_ms = WLAN_WAIT_TIME_STATS,
- };
-
- if (!adapter) {
- hdd_err("Invalid context, adapter");
- return QDF_STATUS_E_FAULT;
- }
- if (cds_is_driver_recovering() || cds_is_driver_in_bad_state()) {
- hdd_err("Recovery in Progress. State: 0x%x Ignore!!!",
- cds_get_driver_state());
- /* return a cached value */
- *rssi_value = adapter->rssi;
- return QDF_STATUS_SUCCESS;
- }
-
- hdd_ctx = WLAN_HDD_GET_CTX(adapter);
- sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-
- if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
- hdd_debug("Not associated!, rssi on disconnect %d",
- adapter->rssi_on_disconnect);
- *rssi_value = adapter->rssi_on_disconnect;
- return QDF_STATUS_SUCCESS;
- }
-
- if (sta_ctx->hdd_reassoc_scenario) {
- hdd_debug("Roaming in progress, return cached RSSI");
- *rssi_value = adapter->rssi;
- return QDF_STATUS_SUCCESS;
- }
-
- request = osif_request_alloc(¶ms);
- if (!request) {
- hdd_err("Request allocation failure, return cached RSSI");
- *rssi_value = adapter->rssi;
- return QDF_STATUS_SUCCESS;
- }
- cookie = osif_request_cookie(request);
-
- status = sme_get_rssi(hdd_ctx->mac_handle, hdd_get_rssi_cb,
- sta_ctx->conn_info.sta_id[0],
- sta_ctx->conn_info.bssid, adapter->rssi,
- cookie);
- if (QDF_STATUS_SUCCESS != status) {
- hdd_err("Unable to retrieve RSSI");
- /* we'll returned a cached value below */
- } else {
- /* request was sent -- wait for the response */
- ret = osif_request_wait_for_response(request);
- if (ret) {
- hdd_warn("SME timed out while retrieving RSSI");
- /* we'll returned a cached value below */
- } else {
- /* update the adapter with the fresh results */
- priv = osif_request_priv(request);
-
- adapter->rssi = priv->rssi;
-
- /*
- * for new connection there might be no valid previous
- * RSSI.
- */
- if (!adapter->rssi) {
- hdd_get_rssi_snr_by_bssid(adapter,
- sta_ctx->conn_info.bssid.bytes,
- &adapter->rssi, NULL);
- }
- }
- }
-
- /*
- * either we never sent a request, we sent a request and
- * received a response or we sent a request and timed out.
- * regardless we are done with the request.
- */
- osif_request_put(request);
-
- *rssi_value = adapter->rssi;
- hdd_debug("RSSI = %d", *rssi_value);
-
- return QDF_STATUS_SUCCESS;
-}
-#endif /* QCA_SUPPORT_CP_STATS */
struct snr_priv {
int8_t snr;
@@ -5598,115 +5472,6 @@
return 0;
}
-struct peer_rssi_priv {
- struct sir_peer_sta_info peer_sta_info;
-};
-
-/**
- * hdd_get_peer_rssi_cb() - get peer station's rssi callback
- * @sta_rssi: pointer of peer information
- * @context: get rssi callback context
- *
- * This function will fill rssi information to rssi priv
- * adapter
- *
- */
-static void hdd_get_peer_rssi_cb(struct sir_peer_info_resp *sta_rssi,
- void *context)
-{
- struct osif_request *request;
- struct peer_rssi_priv *priv;
- struct sir_peer_info *rssi_info;
- uint8_t peer_num;
-
- if ((!sta_rssi)) {
- hdd_err("Bad param, sta_rssi [%pK]", sta_rssi);
- return;
- }
-
- request = osif_request_get(context);
- if (!request) {
- hdd_err("Obsolete request");
- return;
- }
-
- priv = osif_request_priv(request);
-
- peer_num = sta_rssi->count;
- rssi_info = sta_rssi->info;
-
- hdd_debug("%d peers", peer_num);
-
- if (peer_num > MAX_PEER_STA) {
- hdd_warn("Exceed max peer sta to handle one time %d", peer_num);
- peer_num = MAX_PEER_STA;
- }
-
- qdf_mem_copy(priv->peer_sta_info.info, rssi_info,
- peer_num * sizeof(*rssi_info));
- priv->peer_sta_info.sta_num = peer_num;
-
- osif_request_complete(request);
- osif_request_put(request);
-
-}
-
-int wlan_hdd_get_peer_rssi(struct hdd_adapter *adapter,
- struct qdf_mac_addr *macaddress,
- struct sir_peer_sta_info *peer_sta_info)
-{
- QDF_STATUS status;
- void *cookie;
- int ret;
- struct sir_peer_info_req rssi_req;
- struct osif_request *request;
- struct peer_rssi_priv *priv;
- static const struct osif_request_params params = {
- .priv_size = sizeof(*priv),
- .timeout_ms = WLAN_WAIT_TIME_STATS,
- };
-
- if (!adapter || !macaddress || !peer_sta_info) {
- hdd_err("adapter [%pK], macaddress [%pK], peer_sta_info[%pK]",
- adapter, macaddress, peer_sta_info);
- return -EFAULT;
- }
-
- request = osif_request_alloc(¶ms);
- if (!request) {
- hdd_err("Request allocation failure");
- return -ENOMEM;
- }
-
- cookie = osif_request_cookie(request);
- priv = osif_request_priv(request);
-
- qdf_mem_copy(&rssi_req.peer_macaddr, macaddress,
- QDF_MAC_ADDR_SIZE);
- rssi_req.sessionid = adapter->vdev_id;
- status = sme_get_peer_info(adapter->hdd_ctx->mac_handle,
- rssi_req,
- cookie,
- hdd_get_peer_rssi_cb);
- if (status != QDF_STATUS_SUCCESS) {
- hdd_err("Unable to retrieve statistics for rssi");
- ret = -EFAULT;
- } else {
- ret = osif_request_wait_for_response(request);
- if (ret) {
- hdd_err("SME timed out while retrieving rssi");
- ret = -EFAULT;
- } else {
- *peer_sta_info = priv->peer_sta_info;
- ret = 0;
- }
- }
-
- osif_request_put(request);
-
- return ret;
-}
-
struct peer_info_priv {
struct sir_peer_sta_ext_info peer_sta_ext_info;
};
diff --git a/core/hdd/src/wlan_hdd_stats.h b/core/hdd/src/wlan_hdd_stats.h
index b04767d..b65916a 100644
--- a/core/hdd/src/wlan_hdd_stats.h
+++ b/core/hdd/src/wlan_hdd_stats.h
@@ -399,20 +399,6 @@
int wlan_hdd_get_link_speed(struct hdd_adapter *adapter, uint32_t *link_speed);
/**
- * wlan_hdd_get_peer_rssi() - get station's rssi
- * @adapter: hostapd interface
- * @macaddress: peer sta mac address or ff:ff:ff:ff:ff:ff to query all peer
- * @peer_sta_info: output pointer which will fill by peer sta info
- *
- * This function will call sme_get_peer_info to get rssi
- *
- * Return: 0 on success, otherwise error value
- */
-int wlan_hdd_get_peer_rssi(struct hdd_adapter *adapter,
- struct qdf_mac_addr *macaddress,
- struct sir_peer_sta_info *peer_sta_info);
-
-/**
* wlan_hdd_get_peer_info() - get peer info
* @adapter: hostapd interface
* @macaddress: request peer mac address
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 71286b7..3800c96 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -2605,18 +2605,6 @@
};
/**
- * struct sir_peer_info_req - peer info request struct
- * @peer_macaddr: MAC address
- * @sessionid: vdev id
- *
- * peer info request message's struct
- */
-struct sir_peer_info_req {
- struct qdf_mac_addr peer_macaddr;
- uint8_t sessionid;
-};
-
-/**
* struct sir_peer_info - peer information struct
* @peer_macaddr: MAC address
* @rssi: rssi
@@ -2705,17 +2693,6 @@
/**
* @sta_num: number of peer station which has valid info
- * @info: peer information
- *
- * all SAP peer station's information retrieved
- */
-struct sir_peer_sta_info {
- uint8_t sta_num;
- struct sir_peer_info info[MAX_PEER_STA];
-};
-
-/**
- * @sta_num: number of peer station which has valid info
* @info: peer extended information
*
* all SAP peer station's extended information retrieved
diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h
index 23eeadc..7d5f2aa 100644
--- a/core/mac/inc/wni_api.h
+++ b/core/mac/inc/wni_api.h
@@ -72,8 +72,10 @@
eWNI_SME_DELTS_IND = SIR_SME_MSG_TYPES_BEGIN + 32,
eWNI_SME_GET_STATISTICS_REQ = SIR_SME_MSG_TYPES_BEGIN + 33,
eWNI_SME_GET_STATISTICS_RSP = SIR_SME_MSG_TYPES_BEGIN + 34,
- eWNI_SME_GET_RSSI_REQ = SIR_SME_MSG_TYPES_BEGIN + 35,
- /* unused SIR_SME_MSG_TYPES_BEGIN + 36, */
+ /*
+ * unused SIR_SME_MSG_TYPES_BEGIN + 35
+ * and SIR_SME_MSG_TYPES_BEGIN + 36
+ */
eWNI_SME_WPS_PBC_PROBE_REQ_IND = SIR_SME_MSG_TYPES_BEGIN + 37,
eWNI_SME_UPPER_LAYER_ASSOC_CNF = SIR_SME_MSG_TYPES_BEGIN + 38,
eWNI_SME_SESSION_UPDATE_PARAM = SIR_SME_MSG_TYPES_BEGIN + 39,
diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h
index d5bdd1f..f42850f 100644
--- a/core/mac/src/include/sir_params.h
+++ b/core/mac/src/include/sir_params.h
@@ -622,7 +622,10 @@
#define SIR_HAL_HIDDEN_SSID_RESTART_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 379)
-#define SIR_HAL_GET_PEER_INFO (SIR_HAL_ITC_MSG_TYPES_BEGIN + 386)
+/*
+ * Unused SIR_HAL_ITC_MSG_TYPES_BEGIN + 380 to
+ * SIR_HAL_ITC_MSG_TYPES_BEGIN + 386
+ */
#define SIR_HAL_GET_PEER_INFO_EXT (SIR_HAL_ITC_MSG_TYPES_BEGIN + 387)
/* ARP Debug stats */
diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
index 5f52a66..7440a3b 100644
--- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
+++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
@@ -247,7 +247,6 @@
CASE_RETURN_STRING(eWNI_SME_DELTS_IND);
CASE_RETURN_STRING(eWNI_SME_GET_STATISTICS_REQ);
CASE_RETURN_STRING(eWNI_SME_GET_STATISTICS_RSP);
- CASE_RETURN_STRING(eWNI_SME_GET_RSSI_REQ);
CASE_RETURN_STRING(eWNI_SME_WPS_PBC_PROBE_REQ_IND);
CASE_RETURN_STRING(eWNI_SME_UPPER_LAYER_ASSOC_CNF);
CASE_RETURN_STRING(eWNI_SME_SESSION_UPDATE_PARAM);
diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h
index a226f0b..fb0f236 100644
--- a/core/sme/inc/csr_internal.h
+++ b/core/sme/inc/csr_internal.h
@@ -948,9 +948,6 @@
eCsrStatsRequesterType requesterId,
uint32_t statsMask, tCsrStatsCallback callback,
uint8_t staId, void *pContext, uint8_t sessionId);
-QDF_STATUS csr_get_rssi(struct mac_context *mac, tCsrRssiCallback callback,
- uint8_t staId, struct qdf_mac_addr bssId, int8_t lastRSSI,
- void *pContext);
QDF_STATUS csr_get_snr(struct mac_context *mac, tCsrSnrCallback callback,
uint8_t staId, struct qdf_mac_addr bssId, void *pContext);
QDF_STATUS csr_get_config_param(struct mac_context *mac,
diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h
index 9b3d7d6..59de479 100644
--- a/core/sme/inc/sme_api.h
+++ b/core/sme/inc/sme_api.h
@@ -599,10 +599,6 @@
uint32_t statsMask, tCsrStatsCallback callback,
uint8_t staId, void *pContext, uint8_t sessionId);
#endif
-QDF_STATUS sme_get_rssi(mac_handle_t mac_handle,
- tCsrRssiCallback callback,
- uint8_t staId, struct qdf_mac_addr bssId, int8_t lastRSSI,
- void *pContext);
QDF_STATUS sme_get_snr(mac_handle_t mac_handle,
tCsrSnrCallback callback,
uint8_t staId, struct qdf_mac_addr bssId, void *pContext);
@@ -2260,23 +2256,6 @@
uint32_t param_val);
/**
- * sme_get_peer_info() - sme api to get peer info
- * @mac_handle: Opaque handle to the global MAC context
- * @req: peer info request struct send to wma
- * @context: context of callback function
- * @callbackfn: hdd callback function when receive response
- *
- * This function will send WMA_GET_PEER_INFO to WMA
- *
- * Return: QDF_STATUS_SUCCESS or non-zero on failure
- */
-QDF_STATUS sme_get_peer_info(mac_handle_t mac_handle,
- struct sir_peer_info_req req,
- void *context,
- void (*callbackfn)(struct sir_peer_info_resp *param,
- void *pcontext));
-
-/**
* sme_get_peer_info_ext() - sme api to get peer ext info
* @mac_handle: Opaque handle to the global MAC context
* @req: peer ext info request struct send to wma
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 7517213..914c2a2 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -3484,41 +3484,6 @@
return QDF_STATUS_SUCCESS;
}
-
-/**
- * sme_get_rssi() - API to retrieve current RSSI
- * @mac_handle: Opaque handle to the global MAC context
- * @callback: SME sends back the requested stats using the callback
- * @staId: The station ID for which the RSSI is requested for
- * @bssid: The bssid of the connected session
- * @lastRSSI: RSSI value at time of request. In case fw cannot provide
- * RSSI, do not hold up but return this value.
- * @pContext: user context to be passed back along with the callback
- *
- * A wrapper function that client calls to register a callback to get RSSI
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS sme_get_rssi(mac_handle_t mac_handle,
- tCsrRssiCallback callback, uint8_t staId,
- struct qdf_mac_addr bssId, int8_t lastRSSI,
- void *pContext)
-{
- QDF_STATUS status = QDF_STATUS_E_FAILURE;
- struct mac_context *mac = MAC_CONTEXT(mac_handle);
-
- MTRACE(qdf_trace(QDF_MODULE_ID_SME,
- TRACE_CODE_SME_RX_HDD_GET_RSSI, NO_SESSION, 0));
- status = sme_acquire_global_lock(&mac->sme);
- if (QDF_IS_STATUS_SUCCESS(status)) {
- status = csr_get_rssi(mac, callback,
- staId, bssId, lastRSSI,
- pContext);
- sme_release_global_lock(&mac->sme);
- }
- return status;
-}
-
/*
* sme_get_snr() -
* A wrapper function that client calls to register a callback to get SNR
@@ -7487,56 +7452,6 @@
return status;
}
-QDF_STATUS
-sme_get_peer_info(mac_handle_t mac_handle,
- struct sir_peer_info_req req,
- void *context,
- void (*callbackfn)(struct sir_peer_info_resp *param,
- void *pcontext))
-{
-
- QDF_STATUS status;
- QDF_STATUS qdf_status;
- struct mac_context *mac = MAC_CONTEXT(mac_handle);
- struct scheduler_msg message = {0};
-
- status = sme_acquire_global_lock(&mac->sme);
- if (QDF_STATUS_SUCCESS == status) {
- if (!callbackfn) {
- QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
- "%s: Indication Call back is NULL",
- __func__);
- sme_release_global_lock(&mac->sme);
- return QDF_STATUS_E_FAILURE;
- }
-
- mac->sme.pget_peer_info_ind_cb = callbackfn;
- mac->sme.pget_peer_info_cb_context = context;
-
- /* serialize the req through MC thread */
- message.bodyptr = qdf_mem_malloc(sizeof(req));
- if (!message.bodyptr) {
- sme_release_global_lock(&mac->sme);
- return QDF_STATUS_E_NOMEM;
- }
- qdf_mem_copy(message.bodyptr, &req, sizeof(req));
- message.type = WMA_GET_PEER_INFO;
- message.reserved = 0;
- qdf_status = scheduler_post_message(QDF_MODULE_ID_SME,
- QDF_MODULE_ID_WMA,
- QDF_MODULE_ID_WMA,
- &message);
- if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
- "%s: Post get peer info msg fail", __func__);
- qdf_mem_free(message.bodyptr);
- status = QDF_STATUS_E_FAILURE;
- }
- sme_release_global_lock(&mac->sme);
- }
- return status;
-}
-
QDF_STATUS sme_get_peer_info_ext(mac_handle_t mac_handle,
struct sir_peer_info_ext_req *req,
void *context,
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 05bc42c..9092ce6 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -9937,18 +9937,6 @@
qdf_mem_free(roam_info);
roam_info = NULL;
break;
- case eWNI_SME_GET_RSSI_REQ:
- {
- tAniGetRssiReq *pGetRssiReq = (tAniGetRssiReq *)msg_buf;
-
- if (pGetRssiReq->rssiCallback)
- ((tCsrRssiCallback) pGetRssiReq->rssiCallback)
- (pGetRssiReq->lastRSSI, pGetRssiReq->staId,
- pGetRssiReq->pDevContext);
- else
- sme_err("pGetRssiReq->rssiCallback is NULL");
- }
- break;
case eWNI_SME_TRIGGER_SAE:
sme_debug("Invoke SAE callback");
csr_sae_callback(mac, pSmeRsp);
@@ -10921,55 +10909,6 @@
return fCommandQueued;
}
-static QDF_STATUS csr_send_snr_request(void *pGetRssiReq)
-{
- void *wma_handle;
-
- wma_handle = cds_get_context(QDF_MODULE_ID_WMA);
- if (!wma_handle) {
- QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
- "wma_handle is NULL");
- return QDF_STATUS_E_FAILURE;
- }
-
- if (QDF_STATUS_SUCCESS !=
- wma_send_snr_request(wma_handle, pGetRssiReq)) {
- QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
- "Failed to Trigger wma stats request");
- return QDF_STATUS_E_FAILURE;
- }
-
- /* dont send success, otherwise call back
- * will released with out values
- */
- return QDF_STATUS_E_BUSY;
-}
-
-static void csr_update_rssi(struct mac_context *mac, void *pMsg)
-{
- int8_t rssi = 0;
- tAniGetRssiReq *pGetRssiReq = (tAniGetRssiReq *) pMsg;
- QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
-
- if (pGetRssiReq) {
- qdf_status = csr_send_snr_request(pGetRssiReq);
-
- if (pGetRssiReq->rssiCallback) {
- if (qdf_status != QDF_STATUS_E_BUSY)
- ((tCsrRssiCallback) (pGetRssiReq->rssiCallback))
- (rssi, pGetRssiReq->staId,
- pGetRssiReq->pDevContext);
- else
- sme_debug("rssi request is posted. waiting for reply");
- } else {
- sme_err("GetRssiReq->rssiCallback is NULL");
- return;
- }
- } else
- sme_err("pGetRssiReq is NULL");
-
-}
-
static void csr_update_snr(struct mac_context *mac, void *pMsg)
{
tAniGetSnrReq *pGetSnrReq = (tAniGetSnrReq *) pMsg;
@@ -12448,10 +12387,6 @@
csr_tsm_stats_rsp_processor(mac, pSirMsg);
break;
#endif /* FEATURE_WLAN_ESE */
- case eWNI_SME_GET_RSSI_REQ:
- sme_debug("GetRssiReq from self");
- csr_update_rssi(mac, pSirMsg);
- break;
case eWNI_SME_GET_SNR_REQ:
sme_debug("GetSnrReq from self");
csr_update_snr(mac, pSirMsg);
@@ -17715,53 +17650,6 @@
}
#endif /* QCA_SUPPORT_CP_STATS */
-QDF_STATUS csr_get_rssi(struct mac_context *mac,
- tCsrRssiCallback callback,
- uint8_t staId,
- struct qdf_mac_addr bssId,
- int8_t lastRSSI, void *pContext)
-{
- QDF_STATUS status = QDF_STATUS_SUCCESS;
- struct scheduler_msg msg = {0};
- uint32_t sessionId;
- tAniGetRssiReq *pMsg;
-
- status = csr_roam_get_session_id_from_bssid(mac, &bssId, &sessionId);
- if (!QDF_IS_STATUS_SUCCESS(status)) {
- callback(lastRSSI, staId, pContext);
- sme_err("Failed to get SessionId");
- return QDF_STATUS_E_FAILURE;
- }
-
- pMsg = qdf_mem_malloc(sizeof(tAniGetRssiReq));
- if (!pMsg) {
- return QDF_STATUS_E_NOMEM;
- }
-
- pMsg->msgType = eWNI_SME_GET_RSSI_REQ;
- pMsg->msgLen = (uint16_t) sizeof(tAniGetRssiReq);
- pMsg->sessionId = sessionId;
- pMsg->staId = staId;
- pMsg->rssiCallback = callback;
- pMsg->pDevContext = pContext;
- /*
- * store RSSI at time of calling, so that if RSSI request cannot
- * be sent to firmware, this value can be used to return immediately
- */
- pMsg->lastRSSI = lastRSSI;
- msg.type = eWNI_SME_GET_RSSI_REQ;
- msg.bodyptr = pMsg;
- msg.reserved = 0;
- if (QDF_STATUS_SUCCESS != scheduler_post_message(QDF_MODULE_ID_SME,
- QDF_MODULE_ID_SME,
- QDF_MODULE_ID_SME,
- &msg)) {
- qdf_mem_free((void *)pMsg);
- status = QDF_STATUS_E_FAILURE;
- }
- return status;
-}
-
QDF_STATUS csr_get_snr(struct mac_context *mac,
tCsrSnrCallback callback,
uint8_t staId, struct qdf_mac_addr bssId, void *pContext)
diff --git a/core/sme/src/csr/csr_cmd_process.c b/core/sme/src/csr/csr_cmd_process.c
index 9e8fcc8..11ae301 100644
--- a/core/sme/src/csr/csr_cmd_process.c
+++ b/core/sme/src/csr/csr_cmd_process.c
@@ -94,18 +94,6 @@
sme_rsp->messageType, cur_state);
csr_roam_check_for_link_status_change(mac_ctx,
sme_rsp);
- } else if (eWNI_SME_GET_RSSI_REQ ==
- sme_rsp->messageType) {
- tAniGetRssiReq *pGetRssiReq =
- (tAniGetRssiReq *) msg_buf;
- if (!pGetRssiReq->rssiCallback) {
- sme_err("rssiCallback is NULL");
- return status;
- }
- ((tCsrRssiCallback)(pGetRssiReq->rssiCallback))(
- pGetRssiReq->lastRSSI,
- pGetRssiReq->staId,
- pGetRssiReq->pDevContext);
} else {
sme_err("Message 0x%04X is not handled by CSR state is %d session Id %d",
sme_rsp->messageType, cur_state,
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index 35aa1d6..76e04c4 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -1642,9 +1642,6 @@
tp_wma_trigger_uapsd_params
trigger_uapsd_params);
-/* added to get average snr for both data and beacon */
-QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, void *pGetRssiReq);
-
void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle);
void wma_log_completion_timeout(void *data);
diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h
index bad0b95..8eddad7 100644
--- a/core/wma/inc/wma_internal.h
+++ b/core/wma/inc/wma_internal.h
@@ -1045,9 +1045,6 @@
void wma_process_link_status_req(tp_wma_handle wma,
tAniGetLinkStatus *pGetLinkStatus);
-QDF_STATUS wma_get_peer_info(WMA_HANDLE handle,
- struct sir_peer_info_req *peer_info_req);
-
/**
* wma_get_peer_info_ext() - get peer info
* @handle: wma interface
diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h
index 7a620dd..08fde31 100644
--- a/core/wma/inc/wma_types.h
+++ b/core/wma/inc/wma_types.h
@@ -333,7 +333,6 @@
#define WMA_DISASSOC_TX_COMP SIR_HAL_DISASSOC_TX_COMP
#define WMA_DEAUTH_TX_COMP SIR_HAL_DEAUTH_TX_COMP
-#define WMA_GET_PEER_INFO SIR_HAL_GET_PEER_INFO
#define WMA_GET_PEER_INFO_EXT SIR_HAL_GET_PEER_INFO_EXT
#define WMA_GET_ISOLATION SIR_HAL_GET_ISOLATION
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index 05388ad..3158e24 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -240,49 +240,6 @@
#endif
/**
- * wma_send_snr_request() - send request to fw to get RSSI stats
- * @wma_handle: wma handle
- * @pGetRssiReq: get RSSI request
- *
- * Return: QDF status
- */
-QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle,
- void *pGetRssiReq)
-{
- tAniGetRssiReq *pRssiBkUp = NULL;
-
- /* command is in progress */
- if (wma_handle->pGetRssiReq)
- return QDF_STATUS_SUCCESS;
-
- /* create a copy of csrRssiCallback to send rssi value
- * after wmi event
- */
- if (pGetRssiReq) {
- pRssiBkUp = qdf_mem_malloc(sizeof(tAniGetRssiReq));
- if (!pRssiBkUp) {
- wma_handle->pGetRssiReq = NULL;
- return QDF_STATUS_E_NOMEM;
- }
- pRssiBkUp->sessionId =
- ((tAniGetRssiReq *) pGetRssiReq)->sessionId;
- pRssiBkUp->rssiCallback =
- ((tAniGetRssiReq *) pGetRssiReq)->rssiCallback;
- pRssiBkUp->pDevContext =
- ((tAniGetRssiReq *) pGetRssiReq)->pDevContext;
- wma_handle->pGetRssiReq = (void *)pRssiBkUp;
- }
-
- if (wmi_unified_snr_request_cmd(wma_handle->wmi_handle)) {
- WMA_LOGE("Failed to send host stats request to fw");
- qdf_mem_free(pRssiBkUp);
- wma_handle->pGetRssiReq = NULL;
- return QDF_STATUS_E_FAILURE;
- }
- return QDF_STATUS_SUCCESS;
-}
-
-/**
* wma_get_snr() - get RSSI from fw
* @psnr_req: request params
*
@@ -800,51 +757,6 @@
return QDF_STATUS_SUCCESS;
}
-QDF_STATUS wma_get_peer_info(WMA_HANDLE handle,
- struct sir_peer_info_req *peer_info_req)
-{
- tp_wma_handle wma_handle = (tp_wma_handle)handle;
- wmi_request_stats_cmd_fixed_param *cmd;
- wmi_buf_t wmi_buf;
- uint32_t len;
- uint8_t *buf_ptr;
-
- if (!wma_handle || !wma_handle->wmi_handle) {
- WMA_LOGE("%s: WMA is closed, can not issue get rssi",
- __func__);
- return QDF_STATUS_E_INVAL;
- }
-
- len = sizeof(wmi_request_stats_cmd_fixed_param);
- wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len);
- if (!wmi_buf)
- return QDF_STATUS_E_NOMEM;
-
- buf_ptr = (uint8_t *)wmi_buf_data(wmi_buf);
-
- cmd = (wmi_request_stats_cmd_fixed_param *)buf_ptr;
- WMITLV_SET_HDR(&cmd->tlv_header,
- WMITLV_TAG_STRUC_wmi_request_stats_cmd_fixed_param,
- WMITLV_GET_STRUCT_TLVLEN(wmi_request_stats_cmd_fixed_param));
-
- cmd->stats_id = WMI_REQUEST_PEER_STAT;
- cmd->vdev_id = peer_info_req->sessionid;
- WMI_CHAR_ARRAY_TO_MAC_ADDR(peer_info_req->peer_macaddr.bytes,
- &cmd->peer_macaddr);
- wma_handle->get_sta_peer_info = true;
-
- if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len,
- WMI_REQUEST_STATS_CMDID)) {
- wmi_buf_free(wmi_buf);
- return QDF_STATUS_E_FAILURE;
- }
-
- qdf_mem_copy(&(wma_handle->peer_macaddr),
- &(peer_info_req->peer_macaddr),
- QDF_MAC_ADDR_SIZE);
- return QDF_STATUS_SUCCESS;
-}
-
QDF_STATUS wma_get_peer_info_ext(WMA_HANDLE handle,
struct sir_peer_info_ext_req *peer_info_req)
{
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index e45eab0..cf7fc30 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -8785,10 +8785,6 @@
(tDisableIntraBssFwd *) msg->bodyptr);
qdf_mem_free(msg->bodyptr);
break;
- case WMA_GET_PEER_INFO:
- wma_get_peer_info(wma_handle, msg->bodyptr);
- qdf_mem_free(msg->bodyptr);
- break;
case WMA_GET_PEER_INFO_EXT:
wma_get_peer_info_ext(wma_handle, msg->bodyptr);
qdf_mem_free(msg->bodyptr);