summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnurag Chouhan <achouhan@codeaurora.org>2017-03-21 22:21:00 +0530
committerSandeep Puligilla <spuligil@codeaurora.org>2017-03-23 03:12:25 -0700
commit0930762b9a2bc137f2aaddcc30d22196873c4c3e (patch)
tree9e7bdd4bc4516bbda529dca287ba5b27d4ec7ba3
parent55f17f4e69af0754677735bb730f199bb7dec748 (diff)
qcacld-3.0: Fix compilation error when feature DISA is disabled
wma_get_arp_stats_handler is defined under WLAN_FEATURE_DISA Compilation error observed when WLAN_FEATURE_DISA is disabled. clear the stats as part of clear command commands. Change-Id: Id1fa35646a3988db3afc2df3f7c5ecb97e618933 CRs-fixed: 2022681
-rw-r--r--core/hdd/src/wlan_hdd_cfg80211.c4
-rw-r--r--core/wma/src/wma_features.c124
2 files changed, 64 insertions, 64 deletions
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 7c8bc6cd581c..268694f60dcf 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -8648,9 +8648,9 @@ static int __wlan_hdd_cfg80211_set_nud_stats(struct wiphy *wiphy,
if (arp_stats_params.flag) {
QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
"%s STATS_SET_START Cleared!!", __func__);
- qdf_mem_zero(&adapter->hdd_stats.hdd_arp_stats,
- sizeof(adapter->hdd_stats.hdd_arp_stats));
}
+ qdf_mem_zero(&adapter->hdd_stats.hdd_arp_stats,
+ sizeof(adapter->hdd_stats.hdd_arp_stats));
arp_stats_params.pkt_type = WLAN_NUD_STATS_ARP_PKT_TYPE;
arp_stats_params.vdev_id = adapter->sessionId;
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index a80509ff16c9..ad0260f08348 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -8626,68 +8626,6 @@ QDF_STATUS wma_encrypt_decrypt_msg(WMA_HANDLE handle,
}
/**
- * wma_get_arp_stats_handler() - handle arp stats data
- * indicated by FW
- * @handle: wma context
- * @data: event buffer
- * @data len: length of event buffer
- *
- * Return: 0 on success
- */
-int wma_get_arp_stats_handler(void *handle, uint8_t *data,
- uint32_t data_len)
-{
- WMI_VDEV_GET_ARP_STAT_EVENTID_param_tlvs *param_buf;
- wmi_vdev_get_arp_stats_event_fixed_param *data_event;
- struct rsp_stats rsp;
- tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE);
-
- ENTER();
-
- if (!mac) {
- WMA_LOGE("%s: Invalid mac context", __func__);
- return -EINVAL;
- }
-
- if (!mac->sme.get_arp_stats_cb) {
- WMA_LOGE("%s: Callback not registered", __func__);
- return -EINVAL;
- }
-
- if (data == NULL) {
- WMA_LOGE("%s: invalid pointer", __func__);
- return -EINVAL;
- }
- param_buf = (WMI_VDEV_GET_ARP_STAT_EVENTID_param_tlvs *)data;
- if (!param_buf) {
- WMA_LOGE("%s: Invalid get arp stats event", __func__);
- return -EINVAL;
- }
- data_event = param_buf->fixed_param;
- if (!data_event) {
- WMA_LOGE("%s: Invalid get arp stats data event", __func__);
- return -EINVAL;
- }
- rsp.arp_req_enqueue = data_event->arp_req_enqueue;
- rsp.vdev_id = data_event->vdev_id;
- rsp.arp_req_tx_success = data_event->arp_req_tx_success;
- rsp.arp_req_tx_failure = data_event->arp_req_tx_failure;
- rsp.arp_rsp_recvd = data_event->arp_rsp_recvd;
- rsp.out_of_order_arp_rsp_drop_cnt =
- data_event->out_of_order_arp_rsp_drop_cnt;
- rsp.dad_detected = data_event->dad_detected;
- rsp.connect_status = data_event->connect_status;
- rsp.ba_session_establishment_status =
- data_event->ba_session_establishment_status;
-
- mac->sme.get_arp_stats_cb(mac->hHdd, &rsp);
-
- EXIT();
-
- return 0;
-}
-
-/**
* wma_encrypt_decrypt_msg_handler() - handle encrypt/decrypt data
* indicated by FW
* @handle: wma context
@@ -8760,6 +8698,68 @@ int wma_encrypt_decrypt_msg_handler(void *handle, uint8_t *data,
#endif
/**
+ * wma_get_arp_stats_handler() - handle arp stats data
+ * indicated by FW
+ * @handle: wma context
+ * @data: event buffer
+ * @data len: length of event buffer
+ *
+ * Return: 0 on success
+ */
+int wma_get_arp_stats_handler(void *handle, uint8_t *data,
+ uint32_t data_len)
+{
+ WMI_VDEV_GET_ARP_STAT_EVENTID_param_tlvs *param_buf;
+ wmi_vdev_get_arp_stats_event_fixed_param *data_event;
+ struct rsp_stats rsp;
+ tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE);
+
+ ENTER();
+
+ if (!mac) {
+ WMA_LOGE("%s: Invalid mac context", __func__);
+ return -EINVAL;
+ }
+
+ if (!mac->sme.get_arp_stats_cb) {
+ WMA_LOGE("%s: Callback not registered", __func__);
+ return -EINVAL;
+ }
+
+ if (data == NULL) {
+ WMA_LOGE("%s: invalid pointer", __func__);
+ return -EINVAL;
+ }
+ param_buf = (WMI_VDEV_GET_ARP_STAT_EVENTID_param_tlvs *)data;
+ if (!param_buf) {
+ WMA_LOGE("%s: Invalid get arp stats event", __func__);
+ return -EINVAL;
+ }
+ data_event = param_buf->fixed_param;
+ if (!data_event) {
+ WMA_LOGE("%s: Invalid get arp stats data event", __func__);
+ return -EINVAL;
+ }
+ rsp.arp_req_enqueue = data_event->arp_req_enqueue;
+ rsp.vdev_id = data_event->vdev_id;
+ rsp.arp_req_tx_success = data_event->arp_req_tx_success;
+ rsp.arp_req_tx_failure = data_event->arp_req_tx_failure;
+ rsp.arp_rsp_recvd = data_event->arp_rsp_recvd;
+ rsp.out_of_order_arp_rsp_drop_cnt =
+ data_event->out_of_order_arp_rsp_drop_cnt;
+ rsp.dad_detected = data_event->dad_detected;
+ rsp.connect_status = data_event->connect_status;
+ rsp.ba_session_establishment_status =
+ data_event->ba_session_establishment_status;
+
+ mac->sme.get_arp_stats_cb(mac->hHdd, &rsp);
+
+ EXIT();
+
+ return 0;
+}
+
+/**
* wma_unified_power_debug_stats_event_handler() - WMA handler function to
* handle Power stats event from firmware
* @handle: Pointer to wma handle