Wi-Fi HAL: Gscan Wifihal log enhancement

This commit addresses additional wifihal log enhancement with respect
to Gscan features. This includes
a) logging of the input parameters,
b) using __FUNCTION__ macro to only have function name logged instead
   of the __func__.
c) Minimized developer level logs.

Change-Id: I7c2af197e012f7aa3abca5e06c3036566d172f97

5 files changed, 503 insertions, 459 deletions

diff --git a/qcwcn/wifi_hal/cpp_bindings.cpp b/qcwcn/wifi_hal/cpp_bindings.cpp
index 87d6e86..00ee1f6 100644
--- a/qcwcn/wifi_hal/cpp_bindings.cpp
+++ b/qcwcn/wifi_hal/cpp_bindings.cpp
@@ -625,7 +625,7 @@ int WifiCommand::requestResponse(WifiRequest& request) {
     while (err > 0) {                   /* wait for reply */
         int res = nl_recvmsgs(mInfo->cmd_sock, cb);
         if (res) {
-            ALOGE("nl80211: %s->nl_recvmsgs failed: %d", __func__, res);
+            ALOGE("nl80211: %s->nl_recvmsgs failed: %d", __FUNCTION__, res);
         }
     }
 out:
@@ -770,7 +770,9 @@ WifiVendorCommand::~WifiVendorCommand()
 // in the corresponding object
 int WifiVendorCommand::handleResponse(WifiEvent &reply)
 {
+#ifdef QC_HAL_DEBUG
     ALOGI("WifiVendorCommand::handleResponse");
+#endif
     struct nlattr **tb = reply.attributes();
     struct nlattr *attr = NULL;
     struct genlmsghdr *gnlh = reply.header();
@@ -779,7 +781,9 @@ int WifiVendorCommand::handleResponse(WifiEvent &reply)
         if (tb[NL80211_ATTR_VENDOR_DATA]) {
             mVendorData = (char *)nla_data(tb[NL80211_ATTR_VENDOR_DATA]);
             mDataLen = nla_len(tb[NL80211_ATTR_VENDOR_DATA]);
-            ALOGD("%s: Vendor data len received:%d", __func__, mDataLen);
+#ifdef QC_HAL_DEBUG
+            ALOGD("%s: Vendor data len received:%d", __FUNCTION__, mDataLen);
+#endif
         }
     }
     return NL_SKIP;
@@ -789,7 +793,9 @@ int WifiVendorCommand::handleResponse(WifiEvent &reply)
 // save it in the object
 int WifiVendorCommand::handleEvent(WifiEvent &event)
 {
+#ifdef QC_HAL_DEBUG
     ALOGI("WifiVendorCommand::handleEvent");
+#endif
     struct nlattr **tb = event.attributes();
     struct nlattr *attr = NULL;
     struct genlmsghdr *gnlh = event.header();
@@ -803,13 +809,17 @@ int WifiVendorCommand::handleEvent(WifiEvent &event)
         mVendor_id = nla_get_u32(tb[NL80211_ATTR_VENDOR_ID]);
         mSubcmd = nla_get_u32(tb[NL80211_ATTR_VENDOR_SUBCMD]);
 
+#ifdef QC_HAL_DEBUG
         ALOGD("%s: Vendor event: vendor_id=0x%x subcmd=%u",
-              __func__, mVendor_id, mSubcmd);
+              __FUNCTION__, mVendor_id, mSubcmd);
+#endif
 
         if (tb[NL80211_ATTR_VENDOR_DATA]) {
             mVendorData = (char *)nla_data(tb[NL80211_ATTR_VENDOR_DATA]);
             mDataLen = nla_len(tb[NL80211_ATTR_VENDOR_DATA]);
-            ALOGD("%s: Vendor data len received:%d", __func__, mDataLen);
+#ifdef QC_HAL_DEBUG
+            ALOGD("%s: Vendor data len received:%d", __FUNCTION__, mDataLen);
+#endif
             hexdump(mVendorData, mDataLen);
         }
     }
@@ -838,7 +848,7 @@ int WifiVendorCommand::create() {
 
     //insert the iface id to be "wlan0"
     ifindex = if_nametoindex("wlan0");
-    ALOGE("%s ifindex obtained:%d",__func__,ifindex);
+    ALOGE("%s ifindex obtained:%d",__FUNCTION__,ifindex);
     mMsg.set_iface_id(ifindex);
 out:
     return ret;
@@ -847,7 +857,7 @@ out:
 
 int WifiVendorCommand::requestResponse()
 {
-    ALOGD("%s: request a response", __func__);
+    ALOGD("%s: request a response", __FUNCTION__);
     return WifiCommand::requestResponse(mMsg);
 }
 
@@ -960,7 +970,7 @@ void WifiVendorCommand::attr_end(struct nlattr *attribute)
 int WifiVendorCommand::set_iface_id(const char* name)
 {
     unsigned ifindex = if_nametoindex(name);
-    ALOGE("%s ifindex obtained:%d",__func__,ifindex);
+    ALOGE("%s ifindex obtained:%d", __FUNCTION__,ifindex);
     return mMsg.set_iface_id(ifindex);
 }
 
diff --git a/qcwcn/wifi_hal/gscan.cpp b/qcwcn/wifi_hal/gscan.cpp
index 456bfd0..8e0eb2a 100644
--- a/qcwcn/wifi_hal/gscan.cpp
+++ b/qcwcn/wifi_hal/gscan.cpp
@@ -39,32 +39,31 @@ GScanCommandEventHandler *GScanPnoSetPasspointListCmdEventHandler = NULL;
 wifi_error wifi_get_valid_channels(wifi_interface_handle handle,
        int band, int max_channels, wifi_channel *channels, int *num_channels)
 {
-    int requestId, ret = 0;
+    int requestId, ret = 0, i=0;
     GScanCommand *gScanCommand;
     struct nlattr *nlData;
     interface_info *ifaceInfo = getIfaceInfo(handle);
     wifi_handle wifiHandle = getWifiHandle(handle);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGE("wifi_get_valid_channels(): Enter");
-
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    if (channels == NULL) {
-        ALOGE("%s: NULL channels pointer provided. Exit.",
-            __func__);
-        return WIFI_ERROR_INVALID_ARGS;
-    }
-
     /* No request id from caller, so generate one and pass it on to the driver.
      * Generate one randomly.
      */
-    srand( time(NULL) );
     requestId = rand();
+    ALOGI("%s: RequestId:%d Enter band:%d max_channels:%d", __FUNCTION__,
+          requestId, band, max_channels);
+
+    if (channels == NULL) {
+        ALOGE("%s: NULL channels pointer provided. Exit.",
+            __FUNCTION__);
+        return WIFI_ERROR_INVALID_ARGS;
+    }
 
     gScanCommand = new GScanCommand(
                             wifiHandle,
@@ -72,7 +71,7 @@ wifi_error wifi_get_valid_channels(wifi_interface_handle handle,
                             OUI_QCA,
                             QCA_NL80211_VENDOR_SUBCMD_GSCAN_GET_VALID_CHANNELS);
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
     /* Create the NL message. */
@@ -111,38 +110,15 @@ wifi_error wifi_get_valid_channels(wifi_interface_handle handle,
     /* Send the msg and wait for a response. */
     ret = gScanCommand->requestResponse();
     if (ret) {
-        ALOGE("%s: Error %d happened. ", __func__, ret);
+        ALOGE("%s: Error %d happened. ", __FUNCTION__, ret);
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete gScanCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
-void get_gscan_capabilities_cb(wifi_gscan_capabilities capa)
-{
-    ALOGD("%s: Capabilities. max_ap_cache_per_scan:%d, "
-            "max_bssid_history_entries:%d, max_hotlist_bssids:%d, "
-            "max_hotlist_ssids:%d, max_rssi_sample_size:%d, "
-            "max_scan_buckets:%d, "
-            "max_scan_cache_size:%d, max_scan_reporting_threshold:%d, "
-            "max_significant_wifi_change_aps:%d, "
-            "max_number_epno_networks:%d, "
-            "max_number_epno_networks_by_ssid:%d, "
-            "max_number_of_white_listed_ssid:%d.",
-            __func__, capa.max_ap_cache_per_scan,
-            capa.max_bssid_history_entries,
-            capa.max_hotlist_bssids, capa.max_hotlist_ssids,
-            capa.max_rssi_sample_size,
-            capa.max_scan_buckets,
-            capa.max_scan_cache_size, capa.max_scan_reporting_threshold,
-            capa.max_significant_wifi_change_aps,
-            capa.max_number_epno_networks,
-            capa.max_number_epno_networks_by_ssid,
-            capa.max_number_of_white_listed_ssid);
-}
-
 wifi_error wifi_get_gscan_capabilities(wifi_interface_handle handle,
                                  wifi_gscan_capabilities *capabilities)
 {
@@ -154,45 +130,34 @@ wifi_error wifi_get_gscan_capabilities(wifi_interface_handle handle,
     wifi_handle wifiHandle = getWifiHandle(handle);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGE("wifi_get_gscan_capabilities(): Enter");
-
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
+    /* No request id from caller, so generate one and pass it on to the driver.
+     * Generate it randomly.
+     */
+    requestId = rand();
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, requestId);
 
     if (capabilities == NULL) {
         ALOGE("%s: NULL capabilities pointer provided. Exit.",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
 
-    /* No request id from caller, so generate one and pass it on to the driver.
-     * Generate it randomly.
-     */
-    srand(time(NULL));
-    requestId = rand();
-
     gScanCommand = new GScanCommand(
                             wifiHandle,
                             requestId,
                             OUI_QCA,
                             QCA_NL80211_VENDOR_SUBCMD_GSCAN_GET_CAPABILITIES);
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
-    GScanCallbackHandler callbackHandler;
-    memset(&callbackHandler, 0, sizeof(callbackHandler));
-    callbackHandler.get_capabilities = get_gscan_capabilities_cb;
-
-    ret = gScanCommand->setCallbackHandler(callbackHandler);
-    if (ret < 0)
-        goto cleanup;
-
     /* Create the NL message. */
     ret = gScanCommand->create();
     if (ret < 0)
@@ -218,13 +183,13 @@ wifi_error wifi_get_gscan_capabilities(wifi_interface_handle handle,
     ret = gScanCommand->allocRspParams(eGScanGetCapabilitiesRspParams);
     if (ret != 0) {
         ALOGE("%s: Failed to allocate memory fo response struct. Error:%d",
-            __func__, ret);
+            __FUNCTION__, ret);
         goto cleanup;
     }
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -232,8 +197,8 @@ wifi_error wifi_get_gscan_capabilities(wifi_interface_handle handle,
 
 cleanup:
     gScanCommand->freeRspParams(eGScanGetCapabilitiesRspParams);
-    ALOGI("%s: Delete object.", __func__);
     delete gScanCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -254,28 +219,26 @@ wifi_error wifi_start_gscan(wifi_request_id id,
     bool previousGScanRunning = false;
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGE("wifi_start_gscan(): Enter");
-
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
+    ALOGI("%s: Enter RequestId:%d ", __FUNCTION__, id);
     /* Wi-Fi HAL doesn't need to check if a similar request to start gscan was
      *  made earlier. If start_gscan() is called while another gscan is already
      *  running, the request will be sent down to driver and firmware. If new
      * request is successfully honored, then Wi-Fi HAL will use the new request
      * id for the GScanStartCmdEventHandler object.
      */
-
     gScanCommand = new GScanCommand(
                                 wifiHandle,
                                 id,
                                 OUI_QCA,
                                 QCA_NL80211_VENDOR_SUBCMD_GSCAN_START);
     if (gScanCommand == NULL) {
-        ALOGE("wifi_start_gscan(): Error GScanCommand NULL");
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -297,6 +260,11 @@ wifi_error wifi_start_gscan(wifi_request_id id,
     num_scan_buckets = (unsigned int)params.num_buckets > MAX_BUCKETS ?
                             MAX_BUCKETS : params.num_buckets;
 
+    ALOGI("%s: Base Period:%d Max_ap_per_scan:%d "
+          "Threshold_percent:%d Threshold_num_scans:%d "
+          "num_buckets:%d", __FUNCTION__, params.base_period,
+          params.max_ap_per_scan, params.report_threshold_percent,
+          params.report_threshold_num_scans, num_scan_buckets);
     if (gScanCommand->put_u32(
             QCA_WLAN_VENDOR_ATTR_GSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID,
             id) ||
@@ -326,6 +294,14 @@ wifi_error wifi_start_gscan(wifi_request_id id,
         bucketSpec = params.buckets[i];
         numChannelSpecs = (unsigned int)bucketSpec.num_channels > MAX_CHANNELS ?
                                 MAX_CHANNELS : bucketSpec.num_channels;
+
+        ALOGI("%s: Index: %d Bucket Id:%d Band:%d Period:%d ReportEvent:%d "
+              "numChannelSpecs:%d max_period:%d exponent:%d step_count:%d",
+              __FUNCTION__, i, bucketSpec.bucket, bucketSpec.band,
+              bucketSpec.period, bucketSpec.report_events,
+              numChannelSpecs, bucketSpec.max_period,
+              bucketSpec.exponent, bucketSpec.step_count);
+
         struct nlattr *nlBucketSpec = gScanCommand->attr_start(i);
         if (gScanCommand->put_u8(
                 QCA_WLAN_VENDOR_ATTR_GSCAN_BUCKET_SPEC_INDEX,
@@ -363,6 +339,10 @@ wifi_error wifi_start_gscan(wifi_request_id id,
             struct nlattr *nl_channelSpec = gScanCommand->attr_start(j);
             wifi_scan_channel_spec channel_spec = bucketSpec.channels[j];
 
+            ALOGI("%s: Channel Spec Index:%d Channel:%d Dwell Time:%d "
+                  "passive:%d", __FUNCTION__, j, channel_spec.channel,
+                  channel_spec.dwellTimeMs, channel_spec.passive);
+
             if ( gScanCommand->put_u32(
                     QCA_WLAN_VENDOR_ATTR_GSCAN_CHANNEL_SPEC_CHANNEL,
                     channel_spec.channel) ||
@@ -402,7 +382,7 @@ wifi_error wifi_start_gscan(wifi_request_id id,
                                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_START,
                                     callbackHandler);
         if (GScanStartCmdEventHandler == NULL) {
-            ALOGE("wifi_start_gscan(): Error GScanStartCmdEventHandler NULL");
+            ALOGE("%s: Error GScanStartCmdEventHandler NULL", __FUNCTION__);
             ret = WIFI_ERROR_UNKNOWN;
             goto cleanup;
         }
@@ -410,13 +390,13 @@ wifi_error wifi_start_gscan(wifi_request_id id,
         previousGScanRunning = true;
         ALOGD("%s: "
                 "GScan is already running with request id=%d",
-                __func__,
+                __FUNCTION__,
                 GScanStartCmdEventHandler->get_request_id());
     }
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("wifi_start_gscan(): requestResponse Error:%d", ret);
+        ALOGE("%s : requestResponse Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -425,15 +405,15 @@ wifi_error wifi_start_gscan(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("wifi_start_gscan(): Delete object.");
     delete gScanCommand;
     /* Delete the command event handler object if ret != 0 */
     if (!previousGScanRunning && ret && GScanStartCmdEventHandler) {
-        ALOGI("wifi_start_gscan(): Error ret:%d, delete event handler object.",
-            ret);
+        ALOGI("%s: Error ret:%d, delete event handler object.",
+            __FUNCTION__, ret);
         delete GScanStartCmdEventHandler;
         GScanStartCmdEventHandler = NULL;
     }
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
@@ -449,19 +429,16 @@ wifi_error wifi_stop_gscan(wifi_request_id id,
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGE("wifi_stop_gscan(): Enter");
-
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGI("Stopping GScan, halHandle = %p", wifiHandle);
-
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
     if (GScanStartCmdEventHandler == NULL) {
-        ALOGE("wifi_stop_gscan: GSCAN isn't running or already stopped. "
-            "Nothing to do. Exit");
+        ALOGE("%s: GSCAN isn't running or already stopped. "
+            "Nothing to do. Exit", __FUNCTION__);
         return WIFI_ERROR_NOT_AVAILABLE;
     }
 
@@ -471,7 +448,7 @@ wifi_error wifi_stop_gscan(wifi_request_id id,
                                 OUI_QCA,
                                 QCA_NL80211_VENDOR_SUBCMD_GSCAN_STOP);
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -500,7 +477,7 @@ wifi_error wifi_stop_gscan(wifi_request_id id,
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         /* Delete different GSCAN event handlers for the specified Request ID. */
         if (GScanStartCmdEventHandler) {
             delete GScanStartCmdEventHandler;
@@ -516,8 +493,8 @@ wifi_error wifi_stop_gscan(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete gScanCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -537,11 +514,11 @@ wifi_error wifi_set_bssid_hotlist(wifi_request_id id,
 
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGD("Setting GScan BSSID Hotlist(): Enter");
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     /* Wi-Fi HAL doesn't need to check if a similar request to set bssid
      * hotlist was made earlier. If set_bssid_hotlist() is called while
@@ -558,7 +535,7 @@ wifi_error wifi_set_bssid_hotlist(wifi_request_id id,
                     OUI_QCA,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_SET_BSSID_HOTLIST);
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -592,6 +569,8 @@ wifi_error wifi_set_bssid_hotlist(wifi_request_id id,
         goto cleanup;
     }
 
+    ALOGI("%s: lost_ap_sample_size:%d numAp:%d", __FUNCTION__,
+          params.lost_ap_sample_size, numAp);
     /* Add the vendor specific attributes for the NL command. */
     nlApThresholdParamList =
         gScanCommand->attr_start(
@@ -617,6 +596,12 @@ wifi_error wifi_set_bssid_hotlist(wifi_request_id id,
         {
             goto cleanup;
         }
+        ALOGI("%s: Index:%d BssId: %hhx:%hhx:%hhx:%hhx:%hhx:%hhx "
+              "Threshold low:%d high:%d", __FUNCTION__, i,
+              apThreshold.bssid[0], apThreshold.bssid[1],
+              apThreshold.bssid[2], apThreshold.bssid[3],
+              apThreshold.bssid[4], apThreshold.bssid[5],
+              apThreshold.low, apThreshold.high);
         gScanCommand->attr_end(nlApThresholdParam);
     }
 
@@ -641,23 +626,23 @@ wifi_error wifi_set_bssid_hotlist(wifi_request_id id,
                             callbackHandler);
         if (GScanSetBssidHotlistCmdEventHandler == NULL) {
             ALOGE("%s: Error instantiating "
-                "GScanSetBssidHotlistCmdEventHandler.", __func__);
+                "GScanSetBssidHotlistCmdEventHandler.", __FUNCTION__);
             ret = WIFI_ERROR_UNKNOWN;
             goto cleanup;
         }
-        ALOGD("%s: Handler object was created for HOTLIST_AP_FOUND.", __func__);
+        ALOGD("%s: Handler object was created for HOTLIST_AP_FOUND.", __FUNCTION__);
     } else {
         previousGScanSetBssidRunning = true;
         ALOGD("%s: "
                 "A HOTLIST_AP_FOUND event handler object already exists "
                 "with request id=%d",
-                __func__,
+                __FUNCTION__,
                 GScanSetBssidHotlistCmdEventHandler->get_request_id());
     }
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -666,7 +651,6 @@ wifi_error wifi_set_bssid_hotlist(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object. ", __func__);
     delete gScanCommand;
     /* Delete the command event handler object if ret != 0 */
     if (!previousGScanSetBssidRunning && ret
@@ -674,6 +658,7 @@ cleanup:
         delete GScanSetBssidHotlistCmdEventHandler;
         GScanSetBssidHotlistCmdEventHandler = NULL;
     }
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -689,11 +674,11 @@ wifi_error wifi_reset_bssid_hotlist(wifi_request_id id,
 
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGE("Resetting GScan BSSID Hotlist(): Enter");
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     if (GScanSetBssidHotlistCmdEventHandler == NULL) {
         ALOGE("wifi_reset_bssid_hotlist: GSCAN bssid_hotlist isn't set. "
@@ -708,7 +693,7 @@ wifi_error wifi_reset_bssid_hotlist(wifi_request_id id,
                         QCA_NL80211_VENDOR_SUBCMD_GSCAN_RESET_BSSID_HOTLIST);
 
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -736,7 +721,7 @@ wifi_error wifi_reset_bssid_hotlist(wifi_request_id id,
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         if (GScanSetBssidHotlistCmdEventHandler) {
             delete GScanSetBssidHotlistCmdEventHandler;
             GScanSetBssidHotlistCmdEventHandler = NULL;
@@ -750,8 +735,8 @@ wifi_error wifi_reset_bssid_hotlist(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete gScanCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -771,11 +756,11 @@ wifi_error wifi_set_significant_change_handler(wifi_request_id id,
 
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGE("Setting GScan Significant Change(): Enter");
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     /* Wi-Fi HAL doesn't need to check if a similar request to set significant
      * change list was made earlier. If set_significant_change() is called while
@@ -791,7 +776,7 @@ wifi_error wifi_set_significant_change_handler(wifi_request_id id,
                     OUI_QCA,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_SET_SIGNIFICANT_CHANGE);
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -832,6 +817,11 @@ wifi_error wifi_set_significant_change_handler(wifi_request_id id,
         goto cleanup;
     }
 
+    ALOGI("%s: Number of AP params:%d Rssi_sample_size:%d "
+          "lost_ap_sample_size:%d min_breaching:%d", __FUNCTION__,
+          numAp, params.rssi_sample_size, params.lost_ap_sample_size,
+          params.min_breaching);
+
     /* Add the vendor specific attributes for the NL command. */
     nlApThresholdParamList =
         gScanCommand->attr_start(
@@ -857,6 +847,13 @@ wifi_error wifi_set_significant_change_handler(wifi_request_id id,
         {
             goto cleanup;
         }
+        ALOGI("%s: ap[%d].bssid:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx "
+              "ap[%d].low:%d  ap[%d].high:%d", __FUNCTION__,
+              i,
+              apThreshold.bssid[0], apThreshold.bssid[1],
+              apThreshold.bssid[2], apThreshold.bssid[3],
+              apThreshold.bssid[4], apThreshold.bssid[5],
+              i, apThreshold.low, i, apThreshold.high);
         gScanCommand->attr_end(nlApThresholdParam);
     }
 
@@ -882,24 +879,24 @@ wifi_error wifi_set_significant_change_handler(wifi_request_id id,
         if (GScanSetSignificantChangeCmdEventHandler == NULL) {
             ALOGE("%s: Error in instantiating, "
                 "GScanSetSignificantChangeCmdEventHandler.",
-                __func__);
+                __FUNCTION__);
             ret = WIFI_ERROR_UNKNOWN;
             goto cleanup;
         }
         ALOGD("%s: Event handler object was created for SIGNIFICANT_CHANGE.",
-            __func__);
+            __FUNCTION__);
     } else {
         previousGScanSetSigChangeRunning = true;
         ALOGD("%s: "
             "A SIGNIFICANT_CHANGE event handler object already exists "
             "with request id=%d",
-            __func__,
+            __FUNCTION__,
             GScanSetSignificantChangeCmdEventHandler->get_request_id());
     }
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -908,7 +905,6 @@ wifi_error wifi_set_significant_change_handler(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     /* Delete the command event handler object if ret != 0 */
     if (!previousGScanSetSigChangeRunning && ret
         && GScanSetSignificantChangeCmdEventHandler) {
@@ -916,6 +912,7 @@ cleanup:
         GScanSetSignificantChangeCmdEventHandler = NULL;
     }
     delete gScanCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -932,11 +929,11 @@ wifi_error wifi_reset_significant_change_handler(wifi_request_id id,
 
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGD("Resetting GScan Significant Change(): Enter");
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     if (GScanSetSignificantChangeCmdEventHandler == NULL) {
         ALOGE("wifi_reset_significant_change_handler: GSCAN significant_change"
@@ -952,7 +949,7 @@ wifi_error wifi_reset_significant_change_handler(wifi_request_id id,
                     OUI_QCA,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_RESET_SIGNIFICANT_CHANGE);
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -981,7 +978,7 @@ wifi_error wifi_reset_significant_change_handler(wifi_request_id id,
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         if (GScanSetSignificantChangeCmdEventHandler) {
             delete GScanSetSignificantChangeCmdEventHandler;
             GScanSetSignificantChangeCmdEventHandler = NULL;
@@ -995,8 +992,8 @@ wifi_error wifi_reset_significant_change_handler(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete gScanCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1020,26 +1017,22 @@ wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface,
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGE("wifi_get_cached_gscan_results(): Enter");
-
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    if (results == NULL || num == NULL) {
-        ALOGE("%s: NULL pointer provided. Exit.",
-            __func__);
-        return WIFI_ERROR_INVALID_ARGS;
-    }
-
     /* No request id from caller, so generate one and pass it on to the driver. */
     /* Generate it randomly */
-    srand(time(NULL));
     requestId = rand();
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, requestId);
 
-    ALOGE("Getting GScan Cached Results, halHandle = %p", wifiHandle);
+    if (results == NULL || num == NULL) {
+        ALOGE("%s: NULL pointer provided. Exit.",
+            __FUNCTION__);
+        return WIFI_ERROR_INVALID_ARGS;
+    }
 
     gScanCommand = new GScanCommand(
                         wifiHandle,
@@ -1047,21 +1040,21 @@ wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface,
                         OUI_QCA,
                         QCA_NL80211_VENDOR_SUBCMD_GSCAN_GET_CACHED_RESULTS);
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
     ret = gScanCommand->allocRspParams(eGScanGetCachedResultsRspParams);
     if (ret != 0) {
         ALOGE("%s: Failed to allocate memory for response struct. Error:%d",
-            __func__, ret);
+            __FUNCTION__, ret);
         goto cleanup;
     }
 
     ret = gScanCommand->allocCachedResultsTemp(max, results);
     if (ret != 0) {
         ALOGE("%s: Failed to allocate memory for temp gscan cached list. "
-            "Error:%d", __func__, ret);
+            "Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -1099,12 +1092,13 @@ wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface,
         goto cleanup;
     }
 
+    ALOGI("%s: flush:%d max:%d", __FUNCTION__, flush, max);
     gScanCommand->attr_end(nlData);
 
     retRequestRsp = gScanCommand->requestResponse();
     if (retRequestRsp != 0) {
         ALOGE("%s: requestResponse Error:%d",
-            __func__, retRequestRsp);
+            __FUNCTION__, retRequestRsp);
         if (retRequestRsp != -ETIMEDOUT) {
             /* Proceed to cleanup & return no results */
             goto cleanup;
@@ -1113,8 +1107,7 @@ wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface,
 
     /* No more data, copy the parsed results into the caller's results array */
     ret = gScanCommand->copyCachedScanResults(num, results);
-    ALOGD("wifi_get_cached_gscan_results: max: %d, num:%d", max,
-        *num);
+    ALOGI("%s: max: %d, num:%d", __FUNCTION__, max, *num);
 
     if (!ret) {
         /* If requestResponse returned a TIMEOUT */
@@ -1123,7 +1116,7 @@ wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface,
                 /* Mark scan results as incomplete for the last scan_id */
                 results[(*num)-1].flags = WIFI_SCAN_FLAG_INTERRUPTED;
                 ALOGD("%s: Timeout happened. Mark scan results as incomplete "
-                    "for scan_id:%d", results[(*num)-1].scan_id);
+                    "for scan_id:%d", __FUNCTION__, results[(*num)-1].scan_id);
                 ret = WIFI_SUCCESS;
             } else
                 ret = WIFI_ERROR_TIMED_OUT;
@@ -1131,8 +1124,8 @@ wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface,
     }
 cleanup:
     gScanCommand->freeRspParams(eGScanGetCachedResultsRspParams);
-    ALOGI("%s: Delete object.", __func__);
     delete gScanCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1145,13 +1138,13 @@ wifi_error wifi_set_scanning_mac_oui(wifi_interface_handle handle, oui scan_oui)
     interface_info *iinfo = getIfaceInfo(handle);
     wifi_handle wifiHandle = getWifiHandle(handle);
 
-    ALOGE("wifi_set_scanning_mac_oui(): Enter");
+    ALOGI("%s: Enter", __FUNCTION__);
 
     vCommand = new WifiVendorCommand(wifiHandle, 0,
             OUI_QCA,
             QCA_NL80211_VENDOR_SUBCMD_SCANNING_MAC_OUI);
     if (vCommand == NULL) {
-        ALOGE("%s: Error vCommand NULL", __func__);
+        ALOGE("%s: Error vCommand NULL", __FUNCTION__);
         return WIFI_ERROR_OUT_OF_MEMORY;
     }
 
@@ -1183,13 +1176,13 @@ wifi_error wifi_set_scanning_mac_oui(wifi_interface_handle handle, oui scan_oui)
 
     ret = vCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         goto cleanup;
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete vCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1210,11 +1203,11 @@ wifi_error wifi_set_ssid_hotlist(wifi_request_id id,
 
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGD("Setting GScan SSID Hotlist(): Enter");
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     /* Wi-Fi HAL doesn't need to check if a similar request to set ssid
      * hotlist was made earlier. If set_ssid_hotlist() is called while
@@ -1231,7 +1224,7 @@ wifi_error wifi_set_ssid_hotlist(wifi_request_id id,
                     OUI_QCA,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_SET_SSID_HOTLIST);
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -1264,6 +1257,10 @@ wifi_error wifi_set_ssid_hotlist(wifi_request_id id,
     {
         goto cleanup;
     }
+    ALOGI("%s: numSsid:%d "
+          "lost_ssid_sameple_size: %d",
+          __FUNCTION__, numSsid,
+          params.lost_ssid_sample_size);
 
     /* Add the vendor specific attributes for the NL command. */
     nlSsidThresholdParamList =
@@ -1293,6 +1290,13 @@ wifi_error wifi_set_ssid_hotlist(wifi_request_id id,
         {
             goto cleanup;
         }
+        ALOGI("%s: SSID[%d].ssid:%s "
+              "SSID[%d].band:%d SSID[%d].low:%d "
+              "SSID[%d].high:%d", __FUNCTION__,
+              i, ssidThreshold.ssid,
+              i, ssidThreshold.band,
+              i, ssidThreshold.low,
+              i, ssidThreshold.high);
         gScanCommand->attr_end(nlSsidThresholdParam);
     }
 
@@ -1317,23 +1321,23 @@ wifi_error wifi_set_ssid_hotlist(wifi_request_id id,
                             callbackHandler);
         if (GScanSetSsidHotlistCmdEventHandler == NULL) {
             ALOGE("%s: Error instantiating "
-                "GScanSetSsidHotlistCmdEventHandler.", __func__);
+                "GScanSetSsidHotlistCmdEventHandler.", __FUNCTION__);
             ret = WIFI_ERROR_UNKNOWN;
             goto cleanup;
         }
-        ALOGD("%s: Handler object was created for HOTLIST_AP_FOUND.", __func__);
+        ALOGD("%s: Handler object was created for HOTLIST_AP_FOUND.", __FUNCTION__);
     } else {
         previousGScanSetSsidRunning = true;
         ALOGD("%s: "
                 "A HOTLIST_AP_FOUND event handler object already exists "
                 "with request id=%d",
-                __func__,
+                __FUNCTION__,
                 GScanSetSsidHotlistCmdEventHandler->get_request_id());
     }
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -1342,7 +1346,6 @@ wifi_error wifi_set_ssid_hotlist(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object. ", __func__);
     delete gScanCommand;
     /* Delete the command event handler object if ret != 0 */
     if (!previousGScanSetSsidRunning && ret
@@ -1350,6 +1353,7 @@ cleanup:
         delete GScanSetSsidHotlistCmdEventHandler;
         GScanSetSsidHotlistCmdEventHandler = NULL;
     }
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1365,11 +1369,11 @@ wifi_error wifi_reset_ssid_hotlist(wifi_request_id id,
 
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGE("Resetting GScan SSID Hotlist: Enter");
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     if (GScanSetSsidHotlistCmdEventHandler == NULL) {
         ALOGE("wifi_reset_ssid_hotlist: GSCAN ssid_hotlist isn't set. "
@@ -1384,7 +1388,7 @@ wifi_error wifi_reset_ssid_hotlist(wifi_request_id id,
                         QCA_NL80211_VENDOR_SUBCMD_GSCAN_RESET_SSID_HOTLIST);
 
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -1412,7 +1416,7 @@ wifi_error wifi_reset_ssid_hotlist(wifi_request_id id,
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         if (GScanSetSsidHotlistCmdEventHandler) {
             delete GScanSetSsidHotlistCmdEventHandler;
             GScanSetSsidHotlistCmdEventHandler = NULL;
@@ -1426,8 +1430,8 @@ wifi_error wifi_reset_ssid_hotlist(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete gScanCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1436,7 +1440,9 @@ GScanCommand::GScanCommand(wifi_handle handle, int id, u32 vendor_id,
                                   u32 subcmd)
         : WifiVendorCommand(handle, id, vendor_id, subcmd)
 {
+#ifdef QC_HAL_DEBUG
     ALOGD("GScanCommand %p constructed", this);
+#endif
     /* Initialize the member data variables here */
     mGetCapabilitiesRspParams = NULL;
     mGetCachedResultsRspParams = NULL;
@@ -1450,7 +1456,9 @@ GScanCommand::GScanCommand(wifi_handle handle, int id, u32 vendor_id,
 
 GScanCommand::~GScanCommand()
 {
+#ifdef QC_HAL_DEBUG
     ALOGD("GScanCommand %p destructor", this);
+#endif
     unregisterVendorHandler(mVendor_id, mSubcmd);
 }
 
@@ -1472,7 +1480,7 @@ int GScanCommand::create() {
         goto out;
 
      ALOGI("%s: mVendor_id = %d, Subcmd = %d.",
-        __func__, mVendor_id, mSubcmd);
+        __FUNCTION__, mVendor_id, mSubcmd);
 
 out:
     return ret;
@@ -1486,7 +1494,7 @@ static int error_handler_gscan(struct sockaddr_nl *nla, struct nlmsgerr *err,
     int *ret = (int *)arg;
     tmp = nla;
     *ret = err->error;
-    ALOGE("%s: Error code:%d (%s)", __func__, *ret, strerror(-(*ret)));
+    ALOGE("%s: Error code:%d (%s)", __FUNCTION__, *ret, strerror(-(*ret)));
     return NL_STOP;
 }
 
@@ -1496,7 +1504,7 @@ static int ack_handler_gscan(struct nl_msg *msg, void *arg)
     int *ret = (int *)arg;
     struct nl_msg * a;
 
-    ALOGE("%s: called", __func__);
+    ALOGE("%s: called", __FUNCTION__);
     a = msg;
     *ret = 0;
     return NL_STOP;
@@ -1508,7 +1516,7 @@ static int finish_handler_gscan(struct nl_msg *msg, void *arg)
   int *ret = (int *)arg;
   struct nl_msg * a;
 
-  ALOGE("%s: called", __func__);
+  ALOGE("%s: called", __FUNCTION__);
   a = msg;
   *ret = 0;
   return NL_SKIP;
@@ -1516,12 +1524,10 @@ static int finish_handler_gscan(struct nl_msg *msg, void *arg)
 
 int GScanCommand::requestResponse()
 {
-    ALOGD("%s: request a response", __func__);
     return WifiCommand::requestResponse(mMsg);
 }
 
 int GScanCommand::handleResponse(WifiEvent &reply) {
-    ALOGI("Received a GScan response message from Driver");
     u32 status;
     int i = 0;
     int ret = WIFI_SUCCESS;
@@ -1540,14 +1546,13 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
         {
             if (!tbVendor[QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_CHANNELS]) {
                 ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_CHANNELS"
-                    " not found", __func__);
+                    " not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
             val = nla_get_u32(tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_CHANNELS]);
 
-            ALOGD("%s: Num channels : %d", __func__, val);
             val = val > (unsigned int)mMaxChannels ?
                     (unsigned int)mMaxChannels : val;
             *mNumChannelsPtr = val;
@@ -1556,7 +1561,7 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
             if (*mNumChannelsPtr > 0 ) {
                 if (!tbVendor[QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CHANNELS]) {
                     ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CHANNELS"
-                        " not found", __func__);
+                        " not found", __FUNCTION__);
                     ret = WIFI_ERROR_INVALID_ARGS;
                     break;
                 }
@@ -1567,10 +1572,10 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
             }
 
             ALOGD("%s: Get valid channels response received.",
-                __func__);
+                __FUNCTION__);
             ALOGD("%s: Num channels : %d",
-                __func__, *mNumChannelsPtr);
-            ALOGD("%s: List of valid channels is: ", __func__);
+                __FUNCTION__, *mNumChannelsPtr);
+            ALOGD("%s: List of valid channels are: ", __FUNCTION__);
             for(i = 0; i < *mNumChannelsPtr; i++)
             {
                 ALOGD("%u", *(mChannels + i));
@@ -1583,10 +1588,35 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
             if (ret) {
                 break;
             }
-            /* Invoke the call back handler func. */
-            if (mHandler.get_capabilities)
-                (*mHandler.get_capabilities)
-                        (mGetCapabilitiesRspParams->capabilities);
+
+            if (mGetCapabilitiesRspParams) {
+                wifi_gscan_capabilities capa =
+                    mGetCapabilitiesRspParams->capabilities;
+                ALOGI("%s: max_ap_cache_per_scan:%d\n"
+                        "max_bssid_history_entries:%d\n"
+                        "max_hotlist_bssids:%d\n"
+                        "max_hotlist_ssids:%d\n"
+                        "max_rssi_sample_size:%d\n"
+                        "max_scan_buckets:%d\n"
+                        "max_scan_cache_size:%d\n"
+                        "max_scan_reporting_threshold:%d\n"
+                        "max_significant_wifi_change_aps:%d\n"
+                        "max_number_epno_networks:%d\n"
+                        "max_number_epno_networks_by_ssid:%d\n"
+                        "max_number_of_white_listed_ssid:%d.",
+                        __FUNCTION__, capa.max_ap_cache_per_scan,
+                        capa.max_bssid_history_entries,
+                        capa.max_hotlist_bssids,
+                        capa.max_hotlist_ssids,
+                        capa.max_rssi_sample_size,
+                        capa.max_scan_buckets,
+                        capa.max_scan_cache_size,
+                        capa.max_scan_reporting_threshold,
+                        capa.max_significant_wifi_change_aps,
+                        capa.max_number_epno_networks,
+                        capa.max_number_epno_networks_by_ssid,
+                        capa.max_number_of_white_listed_ssid);
+            }
         }
         break;
         case QCA_NL80211_VENDOR_SUBCMD_GSCAN_GET_CACHED_RESULTS:
@@ -1599,25 +1629,23 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID]) {
                 ALOGE("%s: GSCAN_RESULTS_REQUEST_ID not"
-                    "found", __func__);
+                    "found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
             id = nla_get_u32(
                     tbVendor[QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID]
                     );
-            ALOGE("%s: Event has Req. ID:%d, ours:%d",
-                __func__, id, mRequestId);
             /* If this is not for us, just ignore it. */
             if (id != mRequestId) {
                 ALOGE("%s: Event has Req. ID:%d <> ours:%d",
-                    __func__, id, mRequestId);
+                    __FUNCTION__, id, mRequestId);
                 break;
             }
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_AVAILABLE not"
-                    "found", __func__);
+                    "found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1628,11 +1656,12 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
              */
             numResults = nla_get_u32(tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]);
-            ALOGE("%s: number of results:%d", __func__, numResults);
+            ALOGE("%s: num Cached results in this fragment:%d",
+                       __FUNCTION__, numResults);
 
             if (!mGetCachedResultsRspParams) {
                 ALOGE("%s: mGetCachedResultsRspParams is NULL, exit.",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1643,15 +1672,13 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_MORE_DATA "
-                    "not found", __func__);
+                    "not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             } else {
                 mGetCachedResultsRspParams->more_data = nla_get_u8(
                     tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]);
-                ALOGE("%s: More data = %d. \n", __func__,
-                                mGetCachedResultsRspParams->more_data);
             }
 
             /* No data in this chunk so skip this chunk */
@@ -1669,8 +1696,8 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
             firstScanIdInPatch = nla_get_u32(tbVendor[
                     QCA_WLAN_VENDOR_ATTR_GSCAN_CACHED_RESULTS_SCAN_ID]);
 
-            ALOGD("firstScanIdInPatch: %d, lastProcessedScanId: %d",
-                firstScanIdInPatch,
+            ALOGE("More data: %d, firstScanIdInPatch: %d, lastProcessedScanId: %d",
+                mGetCachedResultsRspParams->more_data, firstScanIdInPatch,
                 mGetCachedResultsRspParams->lastProcessedScanId);
 
             if (numResults) {
@@ -1692,7 +1719,7 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
         default:
             /* Error case should not happen print log */
             ALOGE("%s: Wrong GScan subcmd response received %d",
-                __func__, mSubcmd);
+                __FUNCTION__, mSubcmd);
     }
 
     /* A parsing error occurred, do the cleanup of gscan result lists. */
@@ -1702,19 +1729,19 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
             case QCA_NL80211_VENDOR_SUBCMD_GSCAN_GET_CACHED_RESULTS:
             {
                 ALOGE("%s: Parsing error, free CachedResultsRspParams",
-                    __func__);
+                    __FUNCTION__);
                 freeRspParams(eGScanGetCachedResultsRspParams);
             }
             break;
             case QCA_NL80211_VENDOR_SUBCMD_GSCAN_GET_CAPABILITIES:
             {
                 ALOGE("%s: Parsing error, free CapabilitiesRspParams",
-                    __func__);
+                    __FUNCTION__);
                 freeRspParams(eGScanGetCapabilitiesRspParams);
             }
             break;
             default:
-                ALOGE("%s: Wrong GScan subcmd received %d", __func__, mSubcmd);
+                ALOGE("%s: Wrong GScan subcmd received %d", __FUNCTION__, mSubcmd);
         }
     }
     return NL_SKIP;
@@ -1725,7 +1752,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
 {
     if (!mGetCapabilitiesRspParams){
         ALOGE("%s: mGetCapabilitiesRspParams ptr is NULL. Exit. ",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
 
@@ -1733,7 +1760,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_SCAN_CACHE_SIZE
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_"
-            "CAPABILITIES_MAX_SCAN_CACHE_SIZE not found", __func__);
+            "CAPABILITIES_MAX_SCAN_CACHE_SIZE not found", __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
     mGetCapabilitiesRspParams->capabilities.max_scan_cache_size =
@@ -1744,7 +1771,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_SCAN_BUCKETS
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX"
-            "_SCAN_BUCKETS not found", __func__);
+            "_SCAN_BUCKETS not found", __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
     mGetCapabilitiesRspParams->capabilities.max_scan_buckets =
@@ -1756,7 +1783,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_AP_CACHE_PER_SCAN
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX"
-            "_AP_CACHE_PER_SCAN not found", __func__);
+            "_AP_CACHE_PER_SCAN not found", __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
     mGetCapabilitiesRspParams->capabilities.max_ap_cache_per_scan =
@@ -1767,7 +1794,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_RSSI_SAMPLE_SIZE
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX"
-            "_RSSI_SAMPLE_SIZE not found", __func__);
+            "_RSSI_SAMPLE_SIZE not found", __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
     mGetCapabilitiesRspParams->capabilities.max_rssi_sample_size =
@@ -1778,7 +1805,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_SCAN_REPORTING_THRESHOLD
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_"
-            "MAX_SCAN_REPORTING_THRESHOLD not found", __func__);
+            "MAX_SCAN_REPORTING_THRESHOLD not found", __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
     mGetCapabilitiesRspParams->capabilities.max_scan_reporting_threshold =
@@ -1790,7 +1817,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_HOTLIST_BSSIDS
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_"
-            "MAX_HOTLIST_BSSIDS not found", __func__);
+            "MAX_HOTLIST_BSSIDS not found", __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
     mGetCapabilitiesRspParams->capabilities.max_hotlist_bssids =
@@ -1801,7 +1828,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_SIGNIFICANT_WIFI_CHANGE_APS
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX"
-            "_SIGNIFICANT_WIFI_CHANGE_APS not found", __func__);
+            "_SIGNIFICANT_WIFI_CHANGE_APS not found", __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
     mGetCapabilitiesRspParams->capabilities.max_significant_wifi_change_aps =
@@ -1812,7 +1839,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_BSSID_HISTORY_ENTRIES
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX"
-            "_BSSID_HISTORY_ENTRIES not found", __func__);
+            "_BSSID_HISTORY_ENTRIES not found", __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
     mGetCapabilitiesRspParams->capabilities.max_bssid_history_entries =
@@ -1824,7 +1851,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_HOTLIST_SSIDS
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES"
-            "_MAX_HOTLIST_SSIDS not found. Set to 0.", __func__);
+            "_MAX_HOTLIST_SSIDS not found. Set to 0.", __FUNCTION__);
         mGetCapabilitiesRspParams->capabilities.max_hotlist_ssids = 0;
     } else {
         mGetCapabilitiesRspParams->capabilities.max_hotlist_ssids =
@@ -1837,7 +1864,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_NUM_EPNO_NETS
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX"
-            "_NUM_EPNO_NETS not found. Set to 0.", __func__);
+            "_NUM_EPNO_NETS not found. Set to 0.", __FUNCTION__);
         mGetCapabilitiesRspParams->capabilities.\
             max_number_epno_networks = 0;
     } else {
@@ -1851,7 +1878,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_NUM_EPNO_NETS_BY_SSID
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX"
-            "_NUM_EPNO_NETS_BY_SSID not found. Set to 0.", __func__);
+            "_NUM_EPNO_NETS_BY_SSID not found. Set to 0.", __FUNCTION__);
         mGetCapabilitiesRspParams->capabilities.\
             max_number_epno_networks_by_ssid = 0;
     } else {
@@ -1865,7 +1892,7 @@ int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
        QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX_NUM_WHITELISTED_SSID
             ]) {
         ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_CAPABILITIES_MAX"
-            "_NUM_WHITELISTED_SSID not found. Set to 0.", __func__);
+            "_NUM_WHITELISTED_SSID not found. Set to 0.", __FUNCTION__);
         mGetCapabilitiesRspParams->capabilities.\
             max_number_of_white_listed_ssid = 0;
     } else {
@@ -1887,7 +1914,7 @@ int GScanCommand:: gscan_get_cached_results(
     int rem = 0;
     u32 len = 0, numScanResults = 0;
     u32 i = mGetCachedResultsRspParams->cachedResultsStartingIndex;
-    ALOGE("gscan_get_cached_results: starting counter: %d", i);
+    ALOGE("%s: starting counter: %d", __FUNCTION__, i);
 
     for (scanResultsInfo = (struct nlattr *) nla_data(tb_vendor[
                QCA_WLAN_VENDOR_ATTR_GSCAN_CACHED_RESULTS_LIST]),
@@ -1906,8 +1933,8 @@ int GScanCommand:: gscan_get_cached_results(
                    QCA_WLAN_VENDOR_ATTR_GSCAN_CACHED_RESULTS_SCAN_ID
                    ])
            {
-               ALOGE("gscan_get_cached_results: GSCAN_CACHED_RESULTS_SCAN_ID"
-                   " not found");
+               ALOGE("%s: GSCAN_CACHED_RESULTS_SCAN_ID"
+                   " not found", __FUNCTION__);
                return WIFI_ERROR_INVALID_ARGS;
            }
            cached_results[i].scan_id =
@@ -1921,8 +1948,8 @@ int GScanCommand:: gscan_get_cached_results(
                    QCA_WLAN_VENDOR_ATTR_GSCAN_CACHED_RESULTS_FLAGS
                    ])
            {
-               ALOGE("gscan_get_cached_results: GSCAN_CACHED_RESULTS_FLAGS "
-                   "not found");
+               ALOGE("%s: GSCAN_CACHED_RESULTS_FLAGS "
+                   "not found", __FUNCTION__);
                return WIFI_ERROR_INVALID_ARGS;
            }
            cached_results[i].flags =
@@ -1934,8 +1961,8 @@ int GScanCommand:: gscan_get_cached_results(
                    QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE
                    ])
            {
-               ALOGE("gscan_get_cached_results: RESULTS_NUM_RESULTS_AVAILABLE "
-                   "not found");
+               ALOGE("%s: RESULTS_NUM_RESULTS_AVAILABLE "
+                   "not found", __FUNCTION__);
                return WIFI_ERROR_INVALID_ARGS;
            }
            numScanResults =
@@ -1947,35 +1974,35 @@ int GScanCommand:: gscan_get_cached_results(
                j = 0; /* reset wifi_scan_result counter */
                cached_results[i].num_results = 0;
                ALOGD("parsing: *lastProcessedScanId [%d] !="
-                   " cached_results[%d].scan_id:%d, j:%d ",
-                   mGetCachedResultsRspParams->lastProcessedScanId, i,
-                   cached_results[i].scan_id, j);
+                     " cached_results[%d].scan_id:%d, j:%d "
+                     "numScanResults: %d",
+                     mGetCachedResultsRspParams->lastProcessedScanId, i,
+                     cached_results[i].scan_id, j, numScanResults);
                mGetCachedResultsRspParams->lastProcessedScanId =
-                cached_results[i].scan_id;
+                   cached_results[i].scan_id;
                mGetCachedResultsRspParams->wifiScanResultsStartingIndex = 0;
                /* Increment the number of cached scan results received */
                mGetCachedResultsRspParams->num_cached_results++;
            } else {
                j = mGetCachedResultsRspParams->wifiScanResultsStartingIndex;
                ALOGD("parsing: *lastProcessedScanId [%d] == "
-                   "cached_results[%d].scan_id:%d, j:%d ",
-                   mGetCachedResultsRspParams->lastProcessedScanId, i,
-                   cached_results[i].scan_id, j);
+                     "cached_results[%d].scan_id:%d, j:%d "
+                     "numScanResults:%d",
+                     mGetCachedResultsRspParams->lastProcessedScanId, i,
+                     cached_results[i].scan_id, j, numScanResults);
            }
 
            if (!cached_results[i].results) {
-               ALOGE("gscan_get_cached_results:NULL cached_results[%d].results"
-                   ". Abort.", i);
+               ALOGE("%s: NULL cached_results[%d].results"
+                     ". Abort.", __FUNCTION__, i);
                return WIFI_ERROR_OUT_OF_MEMORY;
            }
 #ifdef QC_HAL_DEBUG
-           ALOGE("gscan_get_cached_results: scan_id %d ",
+           ALOGE("%s: scan_id %d ", __FUNCTION__,
             cached_results[i].scan_id);
-           ALOGE("gscan_get_cached_results: flags  %u ",
+           ALOGE("%s: flags  %u ", __FUNCTION__,
             cached_results[i].flags);
 #endif
-           ALOGE("gscan_get_cached_results: parsed num_results attribute %d ",
-            numScanResults);
 
            for (wifiScanResultsInfo = (struct nlattr *) nla_data(tb2[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_LIST]),
@@ -1994,8 +2021,9 @@ int GScanCommand:: gscan_get_cached_results(
                            QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_TIME_STAMP
                            ])
                     {
-                        ALOGE("gscan_get_cached_results: "
-                            "RESULTS_SCAN_RESULT_TIME_STAMP not found");
+                        ALOGE("%s: "
+                            "RESULTS_SCAN_RESULT_TIME_STAMP not found",
+                            __FUNCTION__);
                         return WIFI_ERROR_INVALID_ARGS;
                     }
                     cached_results[i].results[j].ts =
@@ -2008,8 +2036,9 @@ int GScanCommand:: gscan_get_cached_results(
                             QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_SSID
                             ])
                     {
-                        ALOGE("gscan_get_cached_results: "
-                            "RESULTS_SCAN_RESULT_SSID not found");
+                        ALOGE("%s: "
+                            "RESULTS_SCAN_RESULT_SSID not found",
+                            __FUNCTION__);
                         return WIFI_ERROR_INVALID_ARGS;
                     }
                     len = nla_len(tb3[
@@ -2027,8 +2056,9 @@ int GScanCommand:: gscan_get_cached_results(
                             QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_BSSID
                             ])
                     {
-                        ALOGE("gscan_get_cached_results: "
-                            "RESULTS_SCAN_RESULT_BSSID not found");
+                        ALOGE("%s: "
+                            "RESULTS_SCAN_RESULT_BSSID not found",
+                            __FUNCTION__);
                         return WIFI_ERROR_INVALID_ARGS;
                     }
                     len = nla_len(
@@ -2047,8 +2077,9 @@ int GScanCommand:: gscan_get_cached_results(
                             QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_CHANNEL
                             ])
                     {
-                        ALOGE("gscan_get_cached_results: "
-                            "RESULTS_SCAN_RESULT_CHANNEL not found");
+                        ALOGE("%s: "
+                            "RESULTS_SCAN_RESULT_CHANNEL not found",
+                            __FUNCTION__);
                         return WIFI_ERROR_INVALID_ARGS;
                     }
                     cached_results[i].results[j].channel =
@@ -2059,8 +2090,9 @@ int GScanCommand:: gscan_get_cached_results(
                             QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_RSSI
                             ])
                     {
-                        ALOGE("gscan_get_cached_results: "
-                            "RESULTS_SCAN_RESULT_RSSI not found");
+                        ALOGE("%s: "
+                            "RESULTS_SCAN_RESULT_RSSI not found",
+                            __FUNCTION__);
                         return WIFI_ERROR_INVALID_ARGS;
                     }
                     cached_results[i].results[j].rssi =
@@ -2071,8 +2103,9 @@ int GScanCommand:: gscan_get_cached_results(
                             QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_RTT
                             ])
                     {
-                        ALOGE("gscan_get_cached_results: "
-                            "RESULTS_SCAN_RESULT_RTT not found");
+                        ALOGE("%s: "
+                            "RESULTS_SCAN_RESULT_RTT not found",
+                            __FUNCTION__);
                         return WIFI_ERROR_INVALID_ARGS;
                     }
                     cached_results[i].results[j].rtt =
@@ -2083,8 +2116,9 @@ int GScanCommand:: gscan_get_cached_results(
                             QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_RTT_SD
                         ])
                     {
-                        ALOGE("gscan_get_cached_results: "
-                            "RESULTS_SCAN_RESULT_RTT_SD not found");
+                        ALOGE("%s: "
+                            "RESULTS_SCAN_RESULT_RTT_SD not found",
+                            __FUNCTION__);
                         return WIFI_ERROR_INVALID_ARGS;
                     }
                     cached_results[i].results[j].rtt_sd =
@@ -2092,11 +2126,11 @@ int GScanCommand:: gscan_get_cached_results(
                         tb3[QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_RTT_SD]);
 #ifdef QC_HAL_DEBUG
                     /* Enable these prints for debugging if needed. */
-                    ALOGD("gscan_get_cached_results: ts  %lld ",
+                    ALOGD("%s: ts  %lld ", __FUNCTION__,
                         cached_results[i].results[j].ts);
-                    ALOGD("gscan_get_cached_results: SSID  %s ",
+                    ALOGD("%s: SSID  %s ", __FUNCTION__,
                         cached_results[i].results[j].ssid);
-                    ALOGD("gscan_get_cached_results: "
+                    ALOGD("%s: ", __FUNCTION__,
                         "BSSID: %02x:%02x:%02x:%02x:%02x:%02x \n",
                         cached_results[i].results[j].bssid[0],
                         cached_results[i].results[j].bssid[1],
@@ -2104,13 +2138,13 @@ int GScanCommand:: gscan_get_cached_results(
                         cached_results[i].results[j].bssid[3],
                         cached_results[i].results[j].bssid[4],
                         cached_results[i].results[j].bssid[5]);
-                    ALOGD("gscan_get_cached_results: channel %d ",
+                    ALOGD("%s: channel %d ", __FUNCTION__,
                         cached_results[i].results[j].channel);
-                    ALOGD("gscan_get_cached_results: rssi  %d ",
+                    ALOGD("%s: rssi  %d ", __FUNCTION__,
                         cached_results[i].results[j].rssi);
-                    ALOGD("gscan_get_cached_results: rtt  %lld ",
+                    ALOGD("%s: rtt  %lld ", __FUNCTION__,
                         cached_results[i].results[j].rtt);
-                    ALOGD("gscan_get_cached_results: rtt_sd  %lld ",
+                    ALOGD("%s: rtt_sd  %lld ", __FUNCTION__,
                         cached_results[i].results[j].rtt_sd);
 #endif
                     /* Increment loop index for next record */
@@ -2126,13 +2160,13 @@ int GScanCommand:: gscan_get_cached_results(
                      * entries in order to properly update NL parsing pointer
                      * so it points to the next scan_id results.
                      */
-                    ALOGD("gscan_get_cached_results: loop index:%d > max num"
+                    ALOGD("%s: loop index:%d > max num"
                         " of wifi_scan_results:%d for gscan cached results"
-                        " bucket:%d. Dummy loop",
+                        " bucket:%d. Dummy loop", __FUNCTION__,
                         j, MAX_AP_CACHE_PER_SCAN, i);
                 }
            }
-           ALOGD("gscan_get_cached_results: cached_results[%d].num_results %d ",
+           ALOGE("%s: cached_results[%d].num_results: %d ", __FUNCTION__,
             i, cached_results[i].num_results);
            /* Increment loop index for next cached scan result record */
            i++;
@@ -2161,11 +2195,11 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
 
     if (!(info->supported_feature_set & WIFI_FEATURE_HAL_EPNO)) {
         ALOGE("%s: Enhanced PNO is not supported by the driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGE("Setting GScan EPNO List(): Enter");
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     /* Wi-Fi HAL doesn't need to check if a similar request to set ePNO
      * list was made earlier. If wifi_set_epno_list() is called while
@@ -2182,21 +2216,21 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
                     OUI_QCA,
                     QCA_NL80211_VENDOR_SUBCMD_PNO_SET_LIST);
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
     /* Create the NL message. */
     ret = gScanCommand->create();
     if (ret < 0) {
-        ALOGE("%s: Failed to create the NL msg. Error:%d", __func__, ret);
+        ALOGE("%s: Failed to create the NL msg. Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
     /* Set the interface Id of the message. */
     ret = gScanCommand->set_iface_id(ifaceInfo->name);
     if (ret < 0) {
-        ALOGE("%s: Failed to set iface id. Error:%d", __func__, ret);
+        ALOGE("%s: Failed to set iface id. Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2204,7 +2238,7 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
     nlData = gScanCommand->attr_start(NL80211_ATTR_VENDOR_DATA);
     if (!nlData) {
         ALOGE("%s: Failed to add attribute NL80211_ATTR_VENDOR_DATA. Error:%d",
-            __func__, ret);
+            __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2217,7 +2251,7 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
             QCA_WLAN_VENDOR_ATTR_PNO_SET_LIST_PARAM_NUM_NETWORKS,
             num_networks))
     {
-        ALOGE("%s: Failed to add vendor atributes. Error:%d", __func__, ret);
+        ALOGE("%s: Failed to add vendor atributes. Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2227,7 +2261,7 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
                 QCA_WLAN_VENDOR_ATTR_PNO_SET_LIST_PARAM_EPNO_NETWORKS_LIST);
     if (!nlPnoParamList) {
         ALOGE("%s: Failed to add attr. PNO_SET_LIST_PARAM_EPNO_NETWORKS_LIST. "
-            "Error:%d", __func__, ret);
+            "Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2237,7 +2271,7 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
         struct nlattr *nlPnoNetwork = gScanCommand->attr_start(i);
         if (!nlPnoNetwork) {
             ALOGE("%s: Failed attr_start for nlPnoNetwork. Error:%d",
-                __func__, ret);
+                __FUNCTION__, ret);
             goto cleanup;
         }
         if (gScanCommand->put_string(
@@ -2254,7 +2288,7 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
                 pnoNetwork.auth_bit_field))
         {
             ALOGE("%s: Failed to add PNO_SET_LIST_PARAM_EPNO_NETWORK_*. "
-                "Error:%d", __func__, ret);
+                "Error:%d", __FUNCTION__, ret);
             goto cleanup;
         }
         gScanCommand->attr_end(nlPnoNetwork);
@@ -2280,24 +2314,24 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
                             callbackHandler);
         if (GScanSetPnoListCmdEventHandler == NULL) {
             ALOGE("%s: Error instantiating "
-                "GScanSetPnoListCmdEventHandler.", __func__);
+                "GScanSetPnoListCmdEventHandler.", __FUNCTION__);
             ret = WIFI_ERROR_UNKNOWN;
             goto cleanup;
         }
         ALOGD("%s: Handler object was created for PNO_NETWORK_FOUND.",
-            __func__);
+            __FUNCTION__);
     } else {
         previousGScanSetEpnoListRunning = true;
         ALOGD("%s: "
                 "A PNO_NETWORK_FOUND event handler object already exists"
                 " with request id=%d",
-                __func__,
+                __FUNCTION__,
                 GScanSetPnoListCmdEventHandler->get_request_id());
     }
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2306,7 +2340,6 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object. ", __func__);
     delete gScanCommand;
     /* Delete the command event handler object if ret != 0 */
     if (!previousGScanSetEpnoListRunning && ret
@@ -2314,6 +2347,7 @@ cleanup:
         delete GScanSetPnoListCmdEventHandler;
         GScanSetPnoListCmdEventHandler = NULL;
     }
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -2333,11 +2367,11 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
 
     if (!(info->supported_feature_set & WIFI_FEATURE_HAL_EPNO)) {
         ALOGE("%s: Enhanced PNO is not supported by the driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGD("Setting ePNO Passpoint List(): Enter");
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     /* Wi-Fi HAL doesn't need to check if a similar request to set ePNO
      * passpoint list was made earlier. If wifi_set_passpoint_list() is called
@@ -2353,21 +2387,21 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
                     OUI_QCA,
                     QCA_NL80211_VENDOR_SUBCMD_PNO_SET_PASSPOINT_LIST);
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
     /* Create the NL message. */
     ret = gScanCommand->create();
     if (ret < 0) {
-        ALOGE("%s: Failed to create the NL msg. Error:%d", __func__, ret);
+        ALOGE("%s: Failed to create the NL msg. Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
     /* Set the interface Id of the message. */
     ret = gScanCommand->set_iface_id(ifaceInfo->name);
     if (ret < 0) {
-        ALOGE("%s: Failed to set iface id. Error:%d", __func__, ret);
+        ALOGE("%s: Failed to set iface id. Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2375,7 +2409,7 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
     nlData = gScanCommand->attr_start(NL80211_ATTR_VENDOR_DATA);
     if (!nlData) {
         ALOGE("%s: Failed to add attribute NL80211_ATTR_VENDOR_DATA. Error:%d",
-            __func__, ret);
+            __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2386,7 +2420,7 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
             QCA_WLAN_VENDOR_ATTR_PNO_PASSPOINT_LIST_PARAM_NUM,
             num))
     {
-        ALOGE("%s: Failed to add vendor atributes. Error:%d", __func__, ret);
+        ALOGE("%s: Failed to add vendor atributes. Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2396,7 +2430,7 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
             QCA_WLAN_VENDOR_ATTR_PNO_PASSPOINT_LIST_PARAM_NETWORK_ARRAY);
     if (!nlPasspointNetworksParamList) {
         ALOGE("%s: Failed attr_start for PASSPOINT_LIST_PARAM_NETWORK_ARRAY. "
-            "Error:%d", __func__, ret);
+            "Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2406,7 +2440,7 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
         struct nlattr *nlPasspointNetworkParam = gScanCommand->attr_start(i);
         if (!nlPasspointNetworkParam) {
             ALOGE("%s: Failed attr_start for nlPasspointNetworkParam. "
-                "Error:%d", __func__, ret);
+                "Error:%d", __FUNCTION__, ret);
             goto cleanup;
         }
         if (gScanCommand->put_u32(
@@ -2424,7 +2458,7 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
                 (char*)passpointNetwork.plmn, 3 * sizeof(u8)))
         {
             ALOGE("%s: Failed to add PNO_PASSPOINT_NETWORK_PARAM_ROAM_* attr. "
-                "Error:%d", __func__, ret);
+                "Error:%d", __FUNCTION__, ret);
             goto cleanup;
         }
         gScanCommand->attr_end(nlPasspointNetworkParam);
@@ -2451,24 +2485,24 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
                         callbackHandler);
         if (GScanPnoSetPasspointListCmdEventHandler == NULL) {
             ALOGE("%s: Error instantiating "
-                "GScanPnoSetPasspointListCmdEventHandler.", __func__);
+                "GScanPnoSetPasspointListCmdEventHandler.", __FUNCTION__);
             ret = WIFI_ERROR_UNKNOWN;
             goto cleanup;
         }
         ALOGD("%s: Handler object was created for PNO_PASSPOINT_"
-            "NETWORK_FOUND.", __func__);
+            "NETWORK_FOUND.", __FUNCTION__);
     } else {
         previousGScanPnoSetPasspointListRunning = true;
         ALOGD("%s: "
                 "A PNO_PASSPOINT_NETWORK_FOUND event handler object "
                 "already exists with request id=%d",
-                __func__,
+                __FUNCTION__,
                 GScanPnoSetPasspointListCmdEventHandler->get_request_id());
     }
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2477,7 +2511,6 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object. ", __func__);
     delete gScanCommand;
     /* Delete the command event handler object if ret != 0 */
     if (!previousGScanPnoSetPasspointListRunning && ret
@@ -2485,6 +2518,7 @@ cleanup:
         delete GScanPnoSetPasspointListCmdEventHandler;
         GScanPnoSetPasspointListCmdEventHandler = NULL;
     }
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -2500,11 +2534,11 @@ wifi_error wifi_reset_passpoint_list(wifi_request_id id,
 
     if (!(info->supported_feature_set & WIFI_FEATURE_HAL_EPNO)) {
         ALOGE("%s: Enhanced PNO is not supported by the driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGE("Resetting ePNO Passpoint List(): Enter");
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     if (GScanPnoSetPasspointListCmdEventHandler == NULL) {
         ALOGE("wifi_reset_passpoint_list: ePNO passpoint_list isn't set. "
@@ -2519,21 +2553,21 @@ wifi_error wifi_reset_passpoint_list(wifi_request_id id,
                     QCA_NL80211_VENDOR_SUBCMD_PNO_RESET_PASSPOINT_LIST);
 
     if (gScanCommand == NULL) {
-        ALOGE("%s: Error GScanCommand NULL", __func__);
+        ALOGE("%s: Error GScanCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
     /* Create the NL message. */
     ret = gScanCommand->create();
     if (ret < 0) {
-        ALOGE("%s: Failed to create the NL msg. Error:%d", __func__, ret);
+        ALOGE("%s: Failed to create the NL msg. Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
     /* Set the interface Id of the message. */
     ret = gScanCommand->set_iface_id(ifaceInfo->name);
     if (ret < 0) {
-        ALOGE("%s: Failed to set iface id. Error:%d", __func__, ret);
+        ALOGE("%s: Failed to set iface id. Error:%d", __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2541,7 +2575,7 @@ wifi_error wifi_reset_passpoint_list(wifi_request_id id,
     nlData = gScanCommand->attr_start(NL80211_ATTR_VENDOR_DATA);
     if (!nlData) {
         ALOGE("%s: Failed to add attribute NL80211_ATTR_VENDOR_DATA. Error:%d",
-            __func__, ret);
+            __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2549,7 +2583,7 @@ wifi_error wifi_reset_passpoint_list(wifi_request_id id,
             QCA_WLAN_VENDOR_ATTR_GSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID, id);
     if (ret < 0) {
         ALOGE("%s: Failed to add vendor data attributes. Error:%d",
-            __func__, ret);
+            __FUNCTION__, ret);
         goto cleanup;
     }
 
@@ -2557,7 +2591,7 @@ wifi_error wifi_reset_passpoint_list(wifi_request_id id,
 
     ret = gScanCommand->requestResponse();
     if (ret != 0) {
-        ALOGE("%s: requestResponse Error:%d",__func__, ret);
+        ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
         if (GScanPnoSetPasspointListCmdEventHandler) {
             delete GScanPnoSetPasspointListCmdEventHandler;
             GScanPnoSetPasspointListCmdEventHandler = NULL;
@@ -2571,8 +2605,8 @@ wifi_error wifi_reset_passpoint_list(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete gScanCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -2584,7 +2618,7 @@ int GScanCommand::setCallbackHandler(GScanCallbackHandler nHandler)
     if (res != 0) {
         /* Error case: should not happen, so print a log when it does. */
         ALOGE("%s: Unable to register Vendor Handler Vendor Id=0x%x subcmd=%u",
-              __func__, mVendor_id, mSubcmd);
+              __FUNCTION__, mVendor_id, mSubcmd);
     }
     return res;
 }
@@ -2600,7 +2634,8 @@ int GScanCommand::allocCachedResultsTemp(int max,
         malloc(max * sizeof(wifi_cached_scan_results));
     if (!mGetCachedResultsRspParams->cached_results) {
         ALOGE("%s: Failed to allocate memory for "
-            "mGetCachedResultsRspParams->cached_results.", __func__);
+              "mGetCachedResultsRspParams->cached_results.",
+              __FUNCTION__);
         return WIFI_ERROR_OUT_OF_MEMORY;
     }
     memset(mGetCachedResultsRspParams->cached_results, 0,
@@ -2645,7 +2680,7 @@ int GScanCommand::allocRspParams(eGScanRspRarams cmd)
             }
         break;
         default:
-            ALOGD("%s: Wrong request for alloc.", __func__);
+            ALOGD("%s: Wrong request for alloc.", __FUNCTION__);
             ret = -1;
     }
     return ret;
@@ -2675,7 +2710,7 @@ void GScanCommand::freeRspParams(eGScanRspRarams cmd)
             }
         break;
         default:
-            ALOGD("%s: Wrong request for free.", __func__);
+            ALOGD("%s: Wrong request for free.", __FUNCTION__);
     }
 }
 
@@ -2687,7 +2722,7 @@ wifi_error GScanCommand::copyCachedScanResults(
     int i;
     wifi_cached_scan_results *cachedResultRsp;
 
-    ALOGD("copyCachedScanResults: Enter");
+    ALOGI("%s: Enter", __FUNCTION__);
 
     if (mGetCachedResultsRspParams && cached_results)
     {
@@ -2701,11 +2736,11 @@ wifi_error GScanCommand::copyCachedScanResults(
             cached_results[i].num_results = cachedResultRsp->num_results;
 
             if (!cached_results[i].num_results) {
-                ALOGD("Error: cached_results[%d].num_results=0", i);
+                ALOGI("Error: cached_results[%d].num_results=0", i);
                 continue;
             }
 
-            ALOGD("copyCachedScanResults: "
+            ALOGI("copyCachedScanResults: "
                 "cached_results[%d].num_results : %d",
                 i, cached_results[i].num_results);
 
@@ -2714,10 +2749,11 @@ wifi_error GScanCommand::copyCachedScanResults(
                 cached_results[i].num_results * sizeof(wifi_scan_result));
         }
     } else {
-        ALOGE("%s: mGetCachedResultsRspParams is NULL", __func__);
+        ALOGE("%s: mGetCachedResultsRspParams is NULL", __FUNCTION__);
         *numResults = 0;
         ret = WIFI_ERROR_INVALID_ARGS;
     }
+    ALOGI("%s: Exit", __FUNCTION__);
     return ret;
 }
 
@@ -2730,7 +2766,7 @@ void GScanCommand::getGetCapabilitiesRspParams(
             &mGetCapabilitiesRspParams->capabilities,
             sizeof(wifi_gscan_capabilities));
     } else {
-        ALOGD("%s: mGetCapabilitiesRspParams is NULL", __func__);
+        ALOGD("%s: mGetCapabilitiesRspParams is NULL", __FUNCTION__);
     }
 }
 
@@ -2758,19 +2794,19 @@ wifi_error wifi_set_ssid_white_list(wifi_request_id id,
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGI("Setting SSID white list(): Enter");
+    if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
+        ALOGE("%s: GSCAN is not supported by driver",
+            __FUNCTION__);
+        return WIFI_ERROR_NOT_SUPPORTED;
+    }
+
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     ALOGI("Number of SSIDs : %d", num_networks);
     for (i = 0; i < num_networks; i++) {
         ALOGI("ssid %d : %s", i, ssids[i].ssid);
     }
 
-    if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
-        ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
-        return WIFI_ERROR_NOT_SUPPORTED;
-    }
-
     roamCommand = new GScanCommand(
                                 wifiHandle,
                                 id,
@@ -2831,8 +2867,8 @@ wifi_error wifi_set_ssid_white_list(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete roamCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
@@ -2848,7 +2884,13 @@ wifi_error wifi_set_gscan_roam_params(wifi_request_id id,
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGI("Setting gscan roam params: Enter");
+    if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
+        ALOGE("%s: GSCAN is not supported by driver",
+            __FUNCTION__);
+        return WIFI_ERROR_NOT_SUPPORTED;
+    }
+
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     if(params) {
         ALOGI("A_band_boost_threshold   %d", params->A_band_boost_threshold);
@@ -2863,12 +2905,6 @@ wifi_error wifi_set_gscan_roam_params(wifi_request_id id,
         return WIFI_ERROR_INVALID_ARGS;
     }
 
-    if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
-        ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
-        return WIFI_ERROR_NOT_SUPPORTED;
-    }
-
     roamCommand = new GScanCommand(wifiHandle,
                                    id,
                                    OUI_QCA,
@@ -2930,8 +2966,8 @@ wifi_error wifi_set_gscan_roam_params(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete roamCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
@@ -2947,21 +2983,22 @@ wifi_error wifi_enable_lazy_roam(wifi_request_id id,
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGI("Setting lazy roam: %s", enable?"ENABLE":"DISABLE");
-
     if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
         ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
+            __FUNCTION__);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
+    ALOGI("%s: RequestId:%d Setting lazy roam: %s",
+          __FUNCTION__, id, enable?"ENABLE":"DISABLE");
+
     roamCommand =
          new GScanCommand(wifiHandle,
                           id,
                           OUI_QCA,
                           QCA_NL80211_VENDOR_SUBCMD_ROAM);
     if (roamCommand == NULL) {
-        ALOGE("%s: Error roamCommand NULL", __func__);
+        ALOGE("%s: Error roamCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -2999,8 +3036,8 @@ wifi_error wifi_enable_lazy_roam(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete roamCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
@@ -3017,7 +3054,13 @@ wifi_error wifi_set_bssid_preference(wifi_request_id id,
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGI("Setting BSSID preferences(): Enter");
+    if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
+        ALOGE("%s: GSCAN is not supported by driver",
+            __FUNCTION__);
+        return WIFI_ERROR_NOT_SUPPORTED;
+    }
+
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     ALOGI("Number of BSSIDs: %d", num_bssid);
     if(prefs && num_bssid) {
@@ -3033,19 +3076,13 @@ wifi_error wifi_set_bssid_preference(wifi_request_id id,
         return WIFI_ERROR_INVALID_ARGS;
     }
 
-    if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
-        ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
-        return WIFI_ERROR_NOT_SUPPORTED;
-    }
-
     roamCommand =
          new GScanCommand(wifiHandle,
                           id,
                           OUI_QCA,
                           QCA_NL80211_VENDOR_SUBCMD_ROAM);
     if (roamCommand == NULL) {
-        ALOGE("%s: Error roamCommand NULL", __func__);
+        ALOGE("%s: Error roamCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -3101,8 +3138,8 @@ wifi_error wifi_set_bssid_preference(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete roamCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
@@ -3118,7 +3155,13 @@ wifi_error wifi_set_bssid_blacklist(wifi_request_id id,
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGI("Setting BSSID blacks list Params(): Enter");
+    if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
+        ALOGE("%s: GSCAN is not supported by driver",
+            __FUNCTION__);
+        return WIFI_ERROR_NOT_SUPPORTED;
+    }
+
+    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
 
     for (i = 0; i < params.num_bssid; i++) {
         ALOGI("BSSID: %d : %02x:%02x:%02x:%02x:%02x:%02x", i,
@@ -3127,19 +3170,13 @@ wifi_error wifi_set_bssid_blacklist(wifi_request_id id,
                 params.bssids[i][4], params.bssids[i][5]);
     }
 
-    if (!(info->supported_feature_set & WIFI_FEATURE_GSCAN)) {
-        ALOGE("%s: GSCAN is not supported by driver",
-            __func__);
-        return WIFI_ERROR_NOT_SUPPORTED;
-    }
-
     roamCommand =
          new GScanCommand(wifiHandle,
                           id,
                           OUI_QCA,
                           QCA_NL80211_VENDOR_SUBCMD_ROAM);
     if (roamCommand == NULL) {
-        ALOGE("%s: Error roamCommand NULL", __func__);
+        ALOGE("%s: Error roamCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -3192,8 +3229,8 @@ wifi_error wifi_set_bssid_blacklist(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete roamCommand;
+    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
diff --git a/qcwcn/wifi_hal/gscan_event_handler.cpp b/qcwcn/wifi_hal/gscan_event_handler.cpp
index 11a92c9..36136e6 100644
--- a/qcwcn/wifi_hal/gscan_event_handler.cpp
+++ b/qcwcn/wifi_hal/gscan_event_handler.cpp
@@ -87,7 +87,7 @@ GScanCommandEventHandler::GScanCommandEventHandler(wifi_handle handle, int id,
         {
             /* Register handlers for northbound asychronous scan events. */
             ALOGD("%s: wait for GSCAN_RESULTS_AVAILABLE, "
-                "FULL_SCAN_RESULT, and SCAN EVENT events. \n", __func__);
+                "FULL_SCAN_RESULT, and SCAN EVENT events. \n", __FUNCTION__);
             ret = registerVendorHandler(mVendor_id,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_SCAN_RESULTS_AVAILABLE) ||
                   registerVendorHandler(mVendor_id,
@@ -96,7 +96,7 @@ GScanCommandEventHandler::GScanCommandEventHandler(wifi_handle handle, int id,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_SCAN_EVENT);
             if (ret < 0)
                 ALOGD("%s: Error in registering handler for "
-                    "GSCAN_START. \n", __func__);
+                    "GSCAN_START. \n", __FUNCTION__);
         }
         break;
 
@@ -106,7 +106,7 @@ GScanCommandEventHandler::GScanCommandEventHandler(wifi_handle handle, int id,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_SIGNIFICANT_CHANGE);
             if (ret < 0)
                 ALOGD("%s: Error in registering handler for "
-                    "GSCAN_SIGNIFICANT_CHANGE. \n", __func__);
+                    "GSCAN_SIGNIFICANT_CHANGE. \n", __FUNCTION__);
         }
         break;
 
@@ -116,13 +116,13 @@ GScanCommandEventHandler::GScanCommandEventHandler(wifi_handle handle, int id,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_HOTLIST_AP_FOUND);
             if (ret < 0)
                 ALOGD("%s: Error in registering handler for"
-                    " GSCAN_HOTLIST_AP_FOUND. \n", __func__);
+                    " GSCAN_HOTLIST_AP_FOUND. \n", __FUNCTION__);
 
             ret = registerVendorHandler(mVendor_id,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_HOTLIST_AP_LOST);
             if (ret < 0)
                 ALOGD("%s: Error in registering handler for"
-                    " GSCAN_HOTLIST_AP_LOST. \n", __func__);
+                    " GSCAN_HOTLIST_AP_LOST. \n", __FUNCTION__);
         }
         break;
 
@@ -132,13 +132,13 @@ GScanCommandEventHandler::GScanCommandEventHandler(wifi_handle handle, int id,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_HOTLIST_SSID_FOUND);
             if (ret < 0)
                 ALOGD("%s: Error in registering handler for"
-                    " GSCAN_HOTLIST_SSID_FOUND. \n", __func__);
+                    " GSCAN_HOTLIST_SSID_FOUND. \n", __FUNCTION__);
 
             ret = registerVendorHandler(mVendor_id,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_HOTLIST_SSID_LOST);
             if (ret < 0)
                 ALOGD("%s: Error in registering handler for"
-                    " GSCAN_HOTLIST_SSID_LOST. \n", __func__);
+                    " GSCAN_HOTLIST_SSID_LOST. \n", __FUNCTION__);
         }
         break;
 
@@ -148,7 +148,7 @@ GScanCommandEventHandler::GScanCommandEventHandler(wifi_handle handle, int id,
                     QCA_NL80211_VENDOR_SUBCMD_PNO_NETWORK_FOUND);
             if (ret < 0)
                 ALOGD("%s: Error in registering handler for"
-                    " PNO_NETWORK_FOUND. \n", __func__);
+                    " PNO_NETWORK_FOUND. \n", __FUNCTION__);
         }
         break;
 
@@ -158,7 +158,7 @@ GScanCommandEventHandler::GScanCommandEventHandler(wifi_handle handle, int id,
                 QCA_NL80211_VENDOR_SUBCMD_PNO_PASSPOINT_NETWORK_FOUND);
             if (ret < 0)
                 ALOGD("%s: Error in registering handler for"
-                    " PNO_PASSPOINT_NETWORK_FOUND. \n", __func__);
+                    " PNO_PASSPOINT_NETWORK_FOUND. \n", __FUNCTION__);
         }
         break;
     }
@@ -173,7 +173,7 @@ GScanCommandEventHandler::~GScanCommandEventHandler()
         {
             /* Unregister event handlers. */
             ALOGD("%s: Unregister handlers for GSCAN_RESULTS_AVAILABLE, "
-            "FULL_SCAN_RESULT, and SCAN EVENT events. \n", __func__);
+            "FULL_SCAN_RESULT, and SCAN EVENT events. \n", __FUNCTION__);
             unregisterVendorHandler(mVendor_id,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_SCAN_RESULTS_AVAILABLE);
             unregisterVendorHandler(mVendor_id,
@@ -621,7 +621,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
     u32 resultsBufSize = 0;
     u32 len = 0;
     int rem = 0;
-    ALOGE("%s: Entering", __func__);
+    ALOGE("%s: Entering", __FUNCTION__);
 
     for (scanResultsInfo = (struct nlattr *) nla_data(tb_vendor[
             QCA_WLAN_VENDOR_ATTR_GSCAN_PNO_RESULTS_PASSPOINT_MATCH_RESULT_LIST]),
@@ -642,7 +642,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                 ])
         {
             ALOGE("%s: GSCAN_PNO_RESULTS_PASSPOINT_MATCH_ID not found",
-                  __func__);
+                  __FUNCTION__);
             return WIFI_ERROR_INVALID_ARGS;
         }
         mPasspointNetId =
@@ -670,7 +670,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_IE_LENGTH
                 ])
             {
-                ALOGE("%s: RESULTS_SCAN_RESULT_IE_LENGTH not found", __func__);
+                ALOGE("%s: RESULTS_SCAN_RESULT_IE_LENGTH not found", __FUNCTION__);
                 return WIFI_ERROR_INVALID_ARGS;
             }
             resultsBufSize +=
@@ -684,7 +684,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
 
             if (!mPasspointNetworkFoundResult) {
                 ALOGE("%s: Failed to alloc memory for result struct. Exit.\n",
-                    __func__);
+                    __FUNCTION__);
                 return WIFI_ERROR_OUT_OF_MEMORY;
             }
             memset(mPasspointNetworkFoundResult, 0, resultsBufSize);
@@ -700,7 +700,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                     ])
             {
                 ALOGE("%s: RESULTS_SCAN_RESULT_TIME_STAMP not found",
-                      __func__);
+                      __FUNCTION__);
                 return WIFI_ERROR_INVALID_ARGS;
             }
             mPasspointNetworkFoundResult->ts =
@@ -713,7 +713,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_SSID
                     ])
             {
-                ALOGE("%s: RESULTS_SCAN_RESULT_SSID not found", __func__);
+                ALOGE("%s: RESULTS_SCAN_RESULT_SSID not found", __FUNCTION__);
                 return WIFI_ERROR_INVALID_ARGS;
             }
              len = nla_len(tb3[
@@ -729,7 +729,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                      QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_BSSID
                      ])
              {
-                 ALOGE("%s: RESULTS_SCAN_RESULT_BSSID not found", __func__);
+                 ALOGE("%s: RESULTS_SCAN_RESULT_BSSID not found", __FUNCTION__);
                  return WIFI_ERROR_INVALID_ARGS;
              }
              len = nla_len(
@@ -746,7 +746,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                      QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_CHANNEL
                      ])
              {
-                 ALOGE("%s: RESULTS_SCAN_RESULT_CHANNEL not found", __func__);
+                 ALOGE("%s: RESULTS_SCAN_RESULT_CHANNEL not found", __FUNCTION__);
                  return WIFI_ERROR_INVALID_ARGS;
              }
              mPasspointNetworkFoundResult->channel =
@@ -757,7 +757,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                      QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_RSSI
                      ])
              {
-                 ALOGE("%s: RESULTS_SCAN_RESULT_RSSI not found", __func__);
+                 ALOGE("%s: RESULTS_SCAN_RESULT_RSSI not found", __FUNCTION__);
                  return WIFI_ERROR_INVALID_ARGS;
              }
              mPasspointNetworkFoundResult->rssi =
@@ -768,7 +768,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                      QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_RTT
                      ])
              {
-                 ALOGE("%s: RESULTS_SCAN_RESULT_RTT not found", __func__);
+                 ALOGE("%s: RESULTS_SCAN_RESULT_RTT not found", __FUNCTION__);
                  return WIFI_ERROR_INVALID_ARGS;
              }
              mPasspointNetworkFoundResult->rtt =
@@ -779,7 +779,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                      QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_RTT_SD
                  ])
              {
-                 ALOGE("%s: RESULTS_SCAN_RESULT_RTT_SD not found", __func__);
+                 ALOGE("%s: RESULTS_SCAN_RESULT_RTT_SD not found", __FUNCTION__);
                  return WIFI_ERROR_INVALID_ARGS;
              }
              mPasspointNetworkFoundResult->rtt_sd =
@@ -791,7 +791,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                  QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_BEACON_PERIOD])
              {
                  ALOGE("%s: RESULTS_SCAN_RESULT_BEACON_PERIOD not found",
-                     __func__);
+                     __FUNCTION__);
                  return WIFI_ERROR_INVALID_ARGS;
              }
              mPasspointNetworkFoundResult->beacon_period =
@@ -804,7 +804,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                      QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_CAPABILITY
                      ])
              {
-                 ALOGE("%s: RESULTS_SCAN_RESULT_CAPABILITY not found", __func__);
+                 ALOGE("%s: RESULTS_SCAN_RESULT_CAPABILITY not found", __FUNCTION__);
                  return WIFI_ERROR_INVALID_ARGS;
              }
              mPasspointNetworkFoundResult->capability =
@@ -817,7 +817,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                      QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_IE_DATA
                  ])
              {
-                 ALOGE("%s: RESULTS_SCAN_RESULT_IE_DATA not found", __func__);
+                 ALOGE("%s: RESULTS_SCAN_RESULT_IE_DATA not found", __FUNCTION__);
                  return WIFI_ERROR_INVALID_ARGS;
              }
              memcpy(&(mPasspointNetworkFoundResult->ie_data[0]),
@@ -825,29 +825,29 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                      QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_IE_DATA]),
                  mPasspointNetworkFoundResult->ie_length);
 
-             ALOGE("%s: ts  %lld ", __func__,
+             ALOGE("%s: ts  %lld ", __FUNCTION__,
                  mPasspointNetworkFoundResult->ts);
-             ALOGE("%s: SSID  %s ", __func__,
+             ALOGE("%s: SSID  %s ", __FUNCTION__,
                  mPasspointNetworkFoundResult->ssid);
              ALOGE("%s: BSSID: %02x:%02x:%02x:%02x:%02x:%02x \n",
-                 __func__,
+                 __FUNCTION__,
                  mPasspointNetworkFoundResult->bssid[0],
                  mPasspointNetworkFoundResult->bssid[1],
                  mPasspointNetworkFoundResult->bssid[2],
                  mPasspointNetworkFoundResult->bssid[3],
                  mPasspointNetworkFoundResult->bssid[4],
                  mPasspointNetworkFoundResult->bssid[5]);
-             ALOGE("%s: channel %d ", __func__,
+             ALOGE("%s: channel %d ", __FUNCTION__,
                  mPasspointNetworkFoundResult->channel);
-             ALOGE("%s: rssi  %d ", __func__,
+             ALOGE("%s: rssi  %d ", __FUNCTION__,
                  mPasspointNetworkFoundResult->rssi);
-             ALOGE("%s: rtt  %lld ", __func__,
+             ALOGE("%s: rtt  %lld ", __FUNCTION__,
                  mPasspointNetworkFoundResult->rtt);
-             ALOGE("%s: rtt_sd  %lld ", __func__,
+             ALOGE("%s: rtt_sd  %lld ", __FUNCTION__,
                  mPasspointNetworkFoundResult->rtt_sd);
-             ALOGE("%s: ie_length  %lld ", __func__,
+             ALOGE("%s: ie_length  %lld ", __FUNCTION__,
                  mPasspointNetworkFoundResult->ie_length);
-             ALOGE("%s: ie_data", __func__);
+             ALOGE("%s: ie_data", __FUNCTION__);
              hexdump(mPasspointNetworkFoundResult->ie_data,
                      mPasspointNetworkFoundResult->ie_length);
         }
@@ -858,7 +858,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
            ])
         {
             ALOGE("%s:PNO_RESULTS_PASSPOINT_MATCH_ANQP_LEN not found",
-                  __func__);
+                  __FUNCTION__);
             return WIFI_ERROR_INVALID_ARGS;
         }
         mPasspointAnqpLen =
@@ -866,7 +866,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                 tb2[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_PNO_RESULTS_PASSPOINT_MATCH_ANQP_LEN]);
         ALOGI("%s: PNO_RESULTS_PASSPOINT_MATCH_ANQP_LEN = %d",
-              __func__, mPasspointAnqpLen);
+              __FUNCTION__, mPasspointAnqpLen);
 
         if (!mPasspointAnqpLen)
         {
@@ -875,7 +875,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
         mPasspointAnqp = (u8 *) malloc (mPasspointAnqpLen);
         if (!mPasspointAnqp) {
             ALOGE("%s: Failed to alloc memory for result struct. Exit.\n",
-                  __func__);
+                  __FUNCTION__);
             return WIFI_ERROR_OUT_OF_MEMORY;
         }
 
@@ -885,7 +885,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                 QCA_WLAN_VENDOR_ATTR_GSCAN_PNO_RESULTS_PASSPOINT_MATCH_ANQP
             ])
             {
-            ALOGE("%s: RESULTS_PASSPOINT_MATCH_ANQP not found", __func__);
+            ALOGE("%s: RESULTS_PASSPOINT_MATCH_ANQP not found", __FUNCTION__);
             return WIFI_ERROR_INVALID_ARGS;
         }
         memcpy(&(mPasspointAnqp[0]),
@@ -893,7 +893,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_passpoint_network_result(
                  QCA_WLAN_VENDOR_ATTR_GSCAN_PNO_RESULTS_PASSPOINT_MATCH_ANQP]),
                mPasspointAnqpLen);
 
-        ALOGE("%s: ANQP LEN:%d, ANQP IE:", __func__, mPasspointAnqpLen);
+        ALOGE("%s: ANQP LEN:%d, ANQP IE:", __FUNCTION__, mPasspointAnqpLen);
         hexdump((char*)mPasspointAnqp, mPasspointAnqpLen);
 
         /* expecting only one result break out after the first loop */
@@ -1028,7 +1028,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_pno_network_results(
         {
             ALOGE("gscan_parse_pno_network_results: "
                 "RESULTS_SCAN_RESULT_BEACON_PERIOD not found",
-                __func__);
+                __FUNCTION__);
             return WIFI_ERROR_INVALID_ARGS;
             break;
         }
@@ -1043,7 +1043,7 @@ wifi_error GScanCommandEventHandler::gscan_parse_pno_network_results(
                 ])
         {
             ALOGE("gscan_parse_pno_network_results: "
-                "RESULTS_SCAN_RESULT_CAPABILITY not found", __func__);
+                "RESULTS_SCAN_RESULT_CAPABILITY not found", __FUNCTION__);
             return WIFI_ERROR_INVALID_ARGS;
             break;
         }
@@ -1107,7 +1107,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID])
             {
                 ALOGE("%s: ATTR_GSCAN_RESULTS_REQUEST_ID not found. Exit.",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1119,7 +1119,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
              */
             if (reqId != mRequestId) {
                 ALOGE("%s: Event has Req. ID:%d <> Ours:%d, continue...",
-                    __func__, reqId, mRequestId);
+                    __FUNCTION__, reqId, mRequestId);
                 reqId = mRequestId;
             }
 
@@ -1129,7 +1129,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_IE_LENGTH
                 ])
             {
-                ALOGE("%s:RESULTS_SCAN_RESULT_IE_LENGTH not found", __func__);
+                ALOGE("%s:RESULTS_SCAN_RESULT_IE_LENGTH not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1138,13 +1138,13 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_IE_LENGTH]);
             ALOGI("%s: RESULTS_SCAN_RESULT_IE_LENGTH =%d",
-                __func__, lengthOfInfoElements);
+                __FUNCTION__, lengthOfInfoElements);
             resultsBufSize =
                 lengthOfInfoElements + sizeof(wifi_scan_result);
             result = (wifi_scan_result *) malloc (resultsBufSize);
             if (!result) {
                 ALOGE("%s: Failed to alloc memory for result struct. Exit.\n",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_OUT_OF_MEMORY;
                 break;
             }
@@ -1159,7 +1159,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 ])
             {
                 ALOGE("%s: RESULTS_SCAN_RESULT_TIME_STAMP not found",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1174,7 +1174,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_SSID
                     ])
             {
-                ALOGE("%s: RESULTS_SCAN_RESULT_SSID not found", __func__);
+                ALOGE("%s: RESULTS_SCAN_RESULT_SSID not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1192,7 +1192,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_BSSID
                     ])
             {
-                ALOGE("%s: RESULTS_SCAN_RESULT_BSSID not found", __func__);
+                ALOGE("%s: RESULTS_SCAN_RESULT_BSSID not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1211,7 +1211,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_CHANNEL
                     ])
             {
-                ALOGE("%s: RESULTS_SCAN_RESULT_CHANNEL not found", __func__);
+                ALOGE("%s: RESULTS_SCAN_RESULT_CHANNEL not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1225,7 +1225,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_RSSI
                     ])
             {
-                ALOGE("%s: RESULTS_SCAN_RESULT_RSSI not found", __func__);
+                ALOGE("%s: RESULTS_SCAN_RESULT_RSSI not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1239,7 +1239,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_RTT
                     ])
             {
-                ALOGE("%s: RESULTS_SCAN_RESULT_RTT not found", __func__);
+                ALOGE("%s: RESULTS_SCAN_RESULT_RTT not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1252,7 +1252,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_RTT_SD
                 ])
             {
-                ALOGE("%s: RESULTS_SCAN_RESULT_RTT_SD not found", __func__);
+                ALOGE("%s: RESULTS_SCAN_RESULT_RTT_SD not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1266,7 +1266,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_BEACON_PERIOD])
             {
                 ALOGE("%s: RESULTS_SCAN_RESULT_BEACON_PERIOD not found",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1280,7 +1280,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_CAPABILITY
                     ])
             {
-                ALOGE("%s: RESULTS_SCAN_RESULT_CAPABILITY not found", __func__);
+                ALOGE("%s: RESULTS_SCAN_RESULT_CAPABILITY not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1294,7 +1294,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_IE_DATA
                 ])
             {
-                ALOGE("%s: RESULTS_SCAN_RESULT_IE_DATA not found", __func__);
+                ALOGE("%s: RESULTS_SCAN_RESULT_IE_DATA not found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1322,7 +1322,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             ALOGE("handleEvent:FULL_SCAN_RESULTS: IE length  %d ",
                 result->ie_length);
 
-            ALOGE("%s: Invoking the callback. \n", __func__);
+            ALOGE("%s: Invoking the callback. \n", __FUNCTION__);
             if (mHandler.on_full_scan_result) {
                 (*mHandler.on_full_scan_result)(reqId, result);
                 /* Reset flag and num counter. */
@@ -1343,7 +1343,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
 
             if (!tbVendor[QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID]) {
                 ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID"
-                    "not found. Exit", __func__);
+                    "not found. Exit", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1353,23 +1353,23 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             /* If this is not for us, then ignore it. */
             if (id != mRequestId) {
                 ALOGE("%s: Event has Req. ID:%d <> ours:%d",
-                    __func__, id, mRequestId);
+                    __FUNCTION__, id, mRequestId);
                 break;
             }
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_AVAILABLE not found",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
             numResults = nla_get_u32(tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]);
-            ALOGE("%s: number of results:%d", __func__, numResults);
+            ALOGE("%s: number of results:%d", __FUNCTION__, numResults);
 
             /* Invoke the callback func to report the number of results. */
             ALOGE("%s: Calling on_scan_results_available handler",
-                __func__);
+                __FUNCTION__);
             if (!mHandler.on_scan_results_available) {
                 break;
             }
@@ -1393,19 +1393,19 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             /* If this is not for us, just ignore it. */
             if (id != mRequestId) {
                 ALOGE("%s: Event has Req. ID:%d <> ours:%d",
-                    __func__, id, mRequestId);
+                    __FUNCTION__, id, mRequestId);
                 break;
             }
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_AVAILABLE not found",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
             numResults = nla_get_u32(tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]);
-            ALOGE("%s: number of results:%d", __func__, numResults);
+            ALOGE("%s: number of results:%d", __FUNCTION__, numResults);
 
             /* Get the memory size of previous fragments, if any. */
             sizeOfObtainedResults = mHotlistApFoundNumResults *
@@ -1428,7 +1428,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
 
             if (!mHotlistApFoundResults) {
                 ALOGE("%s: Failed to alloc memory for results array. Exit.\n",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_OUT_OF_MEMORY;
                 break;
             }
@@ -1436,7 +1436,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             memset((u8 *)mHotlistApFoundResults + sizeOfObtainedResults, 0,
                     resultsBufSize - sizeOfObtainedResults);
 
-            ALOGE("%s: Num of AP FOUND results = %d. \n", __func__,
+            ALOGE("%s: Num of AP FOUND results = %d. \n", __FUNCTION__,
                                             mHotlistApFoundNumResults);
 
             /* To support fragmentation from firmware, monitor the
@@ -1447,7 +1447,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_MORE_DATA not"
-                    " found", __func__);
+                    " found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             } else {
@@ -1455,13 +1455,13 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     tbVendor[
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]);
                 ALOGE("%s: More data = %d. \n",
-                    __func__, mHotlistApFoundMoreData);
+                    __FUNCTION__, mHotlistApFoundMoreData);
             }
 
-            ALOGE("%s: Extract hotlist_ap_found results.\n", __func__);
+            ALOGE("%s: Extract hotlist_ap_found results.\n", __FUNCTION__);
             startingIndex = mHotlistApFoundNumResults - numResults;
             ALOGE("%s: starting_index:%d",
-                __func__, startingIndex);
+                __FUNCTION__, startingIndex);
             ret = gscan_parse_hotlist_ap_results(numResults,
                                                 mHotlistApFoundResults,
                                                 startingIndex,
@@ -1499,19 +1499,19 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             /* If this is not for us, just ignore it. */
             if (id != mRequestId) {
                 ALOGE("%s: Event has Req. ID:%d <> ours:%d",
-                    __func__, id, mRequestId);
+                    __FUNCTION__, id, mRequestId);
                 break;
             }
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_AVAILABLE not found",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
             numResults = nla_get_u32(tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]);
-            ALOGE("%s: number of results:%d", __func__, numResults);
+            ALOGE("%s: number of results:%d", __FUNCTION__, numResults);
 
             /* Get the memory size of previous fragments, if any. */
             sizeOfObtainedResults = mHotlistApLostNumResults *
@@ -1534,7 +1534,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
 
             if (!mHotlistApLostResults) {
                 ALOGE("%s: Failed to alloc memory for results array. Exit.\n",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_OUT_OF_MEMORY;
                 break;
             }
@@ -1542,7 +1542,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             memset((u8 *)mHotlistApLostResults + sizeOfObtainedResults, 0,
                     resultsBufSize - sizeOfObtainedResults);
 
-            ALOGE("%s: Num of AP Lost results = %d. \n", __func__,
+            ALOGE("%s: Num of AP Lost results = %d. \n", __FUNCTION__,
                                             mHotlistApLostNumResults);
 
             /* To support fragmentation from firmware, monitor the
@@ -1553,7 +1553,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_MORE_DATA not"
-                    " found", __func__);
+                    " found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             } else {
@@ -1561,13 +1561,13 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     tbVendor[
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]);
                 ALOGE("%s: More data = %d. \n",
-                    __func__, mHotlistApLostMoreData);
+                    __FUNCTION__, mHotlistApLostMoreData);
             }
 
-            ALOGE("%s: Extract hotlist_ap_Lost results.\n", __func__);
+            ALOGE("%s: Extract hotlist_ap_Lost results.\n", __FUNCTION__);
             startingIndex = mHotlistApLostNumResults - numResults;
             ALOGE("%s: starting_index:%d",
-                __func__, startingIndex);
+                __FUNCTION__, startingIndex);
             ret = gscan_parse_hotlist_ap_results(numResults,
                                                 mHotlistApLostResults,
                                                 startingIndex,
@@ -1604,7 +1604,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID])
             {
                 ALOGE("%s: ATTR_GSCAN_RESULTS_REQUEST_ID not found. Exit.",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1614,14 +1614,14 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             /* If this is not for us, just ignore it. */
             if (reqId != mRequestId) {
                 ALOGE("%s: Event has Req. ID:%d <> ours:%d",
-                    __func__, reqId, mRequestId);
+                    __FUNCTION__, reqId, mRequestId);
                 break;
             }
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE])
             {
                 ALOGE("%s: ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE not found."
-                    "Exit.", __func__);
+                    "Exit.", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1652,7 +1652,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
 
             if (!mSignificantChangeResults) {
                 ALOGE("%s: Failed to alloc memory for results array. Exit.\n",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_OUT_OF_MEMORY;
                 break;
             }
@@ -1661,7 +1661,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     sizeof(wifi_significant_change_result *) *
                                 numResults);
             ALOGD("%s: mSignificantChangeMoreData = %d",
-                    __func__, mSignificantChangeMoreData);
+                    __FUNCTION__, mSignificantChangeMoreData);
 
             for (scanResultsInfo = (struct nlattr *) nla_data(tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_LIST]),
@@ -1682,7 +1682,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 {
                     ALOGE("%s: QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_"
                         "SIGNIFICANT_CHANGE_RESULT_NUM_RSSI not found. "
-                        "Exit.", __func__);
+                        "Exit.", __FUNCTION__);
                     ret = WIFI_ERROR_INVALID_ARGS;
                     break;
                 }
@@ -1696,7 +1696,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
 
                 if (!mSignificantChangeResults[index]) {
                     ALOGE("%s: Failed to alloc memory for results array Exit",
-                        __func__);
+                        __FUNCTION__);
                     ret = WIFI_ERROR_OUT_OF_MEMORY;
                     break;
                 }
@@ -1705,11 +1705,11 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                         0, resultsBufSize);
 
                 ALOGE("%s: For Significant Change results[%d], num_rssi:%d\n",
-                    __func__, index, num_rssi);
+                    __FUNCTION__, index, num_rssi);
                 index++;
             }
 
-            ALOGE("%s: Extract significant change results.\n", __func__);
+            ALOGE("%s: Extract significant change results.\n", __FUNCTION__);
             startingIndex =
                 mSignificantChangeNumResults - numResults;
             ret = gscan_get_significant_change_results(numResults,
@@ -1727,18 +1727,18 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_MORE_DATA not"
-                    " found. Stop parsing and exit.", __func__);
+                    " found. Stop parsing and exit.", __FUNCTION__);
                 break;
             }
             mSignificantChangeMoreData = nla_get_u8(
                 tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]);
             ALOGE("%s: More data = %d. \n",
-                __func__, mSignificantChangeMoreData);
+                __FUNCTION__, mSignificantChangeMoreData);
 
             /* Send the results if no more result fragments are expected */
             if (!mSignificantChangeMoreData) {
-                ALOGE("%s: Invoking the callback. \n", __func__);
+                ALOGE("%s: Invoking the callback. \n", __FUNCTION__);
                 (*mHandler.on_significant_change)(reqId,
                                               mSignificantChangeNumResults,
                                               mSignificantChangeResults);
@@ -1772,7 +1772,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID])
             {
                 ALOGE("%s: ATTR_GSCAN_RESULTS_REQUEST_ID not found. Exit.",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1782,14 +1782,14 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             /* If this is not for us, just ignore it. */
             if (reqId != mRequestId) {
                 ALOGE("%s: Event has Req. ID:%d <> ours:%d",
-                    __func__, reqId, mRequestId);
+                    __FUNCTION__, reqId, mRequestId);
                 break;
             }
 
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_EVENT_TYPE]) {
                 ALOGE("%s: GSCAN_RESULTS_SCAN_EVENT_TYPE not"
-                    " found. Stop parsing and exit.", __func__);
+                    " found. Stop parsing and exit.", __FUNCTION__);
                 break;
             }
             scanEvent = (wifi_scan_event) nla_get_u8(tbVendor[
@@ -1798,13 +1798,13 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_EVENT_STATUS]) {
                 ALOGE("%s: GSCAN_RESULTS_SCAN_EVENT_STATUS not"
-                    " found. Stop parsing and exit.", __func__);
+                    " found. Stop parsing and exit.", __FUNCTION__);
                 break;
             }
             scanEventStatus = nla_get_u32(tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_EVENT_STATUS]);
 
-            ALOGE("%s: Scan event type: %d, status = %d. \n", __func__,
+            ALOGE("%s: Scan event type: %d, status = %d. \n", __FUNCTION__,
                                     scanEvent, scanEventStatus);
             /* Send the results if no more result fragments are expected. */
             (*mHandler.on_scan_event)(scanEvent, scanEventStatus);
@@ -1825,7 +1825,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID])
             {
                 ALOGE("%s: ATTR_GSCAN_RESULTS_REQUEST_ID not found. Exit.",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1836,19 +1836,19 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             /* If this is not for us, just ignore it. */
             if (id != mRequestId) {
                 ALOGE("%s: Event has Req. ID:%d <> ours:%d",
-                    __func__, id, mRequestId);
+                    __FUNCTION__, id, mRequestId);
                 break;
             }
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_AVAILABLE not found",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
             numResults = nla_get_u32(tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]);
-            ALOGE("%s: number of results:%d", __func__, numResults);
+            ALOGE("%s: number of results:%d", __FUNCTION__, numResults);
 
             /* Get the memory size of previous fragments, if any. */
             sizeOfObtainedResults = mHotlistSsidFoundNumResults *
@@ -1871,7 +1871,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
 
             if (!mHotlistSsidFoundResults) {
                 ALOGE("%s: Failed to alloc memory for results array. Exit.\n",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_OUT_OF_MEMORY;
                 break;
             }
@@ -1879,7 +1879,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             memset((u8 *)mHotlistSsidFoundResults + sizeOfObtainedResults, 0,
                     resultsBufSize - sizeOfObtainedResults);
 
-            ALOGE("%s: Num of SSID FOUND results = %d. \n", __func__,
+            ALOGE("%s: Num of SSID FOUND results = %d. \n", __FUNCTION__,
                                             mHotlistSsidFoundNumResults);
 
             /* To support fragmentation from firmware, monitor the
@@ -1890,7 +1890,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_MORE_DATA not"
-                    " found", __func__);
+                    " found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             } else {
@@ -1898,13 +1898,13 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     tbVendor[
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]);
                 ALOGE("%s: More data = %d. \n",
-                    __func__, mHotlistSsidFoundMoreData);
+                    __FUNCTION__, mHotlistSsidFoundMoreData);
             }
 
-            ALOGE("%s: Extract hotlist_ssid_found results.\n", __func__);
+            ALOGE("%s: Extract hotlist_ssid_found results.\n", __FUNCTION__);
             startingIndex = mHotlistSsidFoundNumResults - numResults;
             ALOGE("%s: starting_index:%d",
-                __func__, startingIndex);
+                __FUNCTION__, startingIndex);
             ret = gscan_parse_hotlist_ssid_results(numResults,
                                                 mHotlistSsidFoundResults,
                                                 startingIndex,
@@ -1940,7 +1940,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID])
             {
                 ALOGE("%s: ATTR_GSCAN_RESULTS_REQUEST_ID not found. Exit.",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
@@ -1951,19 +1951,19 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             /* If this is not for us, just ignore it. */
             if (id != mRequestId) {
                 ALOGE("%s: Event has Req. ID:%d <> ours:%d",
-                    __func__, id, mRequestId);
+                    __FUNCTION__, id, mRequestId);
                 break;
             }
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_AVAILABLE not found",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
             numResults = nla_get_u32(tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]);
-            ALOGE("%s: number of results:%d", __func__, numResults);
+            ALOGE("%s: number of results:%d", __FUNCTION__, numResults);
 
             /* Get the memory size of previous fragments, if any. */
             sizeOfObtainedResults = mHotlistSsidLostNumResults *
@@ -1986,7 +1986,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
 
             if (!mHotlistSsidLostResults) {
                 ALOGE("%s: Failed to alloc memory for results array. Exit.\n",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_OUT_OF_MEMORY;
                 break;
             }
@@ -1994,7 +1994,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             memset((u8 *)mHotlistSsidLostResults + sizeOfObtainedResults, 0,
                     resultsBufSize - sizeOfObtainedResults);
 
-            ALOGE("%s: Num of SSID Lost results = %d. \n", __func__,
+            ALOGE("%s: Num of SSID Lost results = %d. \n", __FUNCTION__,
                                             mHotlistSsidLostNumResults);
 
             /* To support fragmentation from firmware, monitor the
@@ -2005,7 +2005,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_MORE_DATA not"
-                    " found", __func__);
+                    " found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             } else {
@@ -2013,13 +2013,13 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     tbVendor[
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]);
                 ALOGE("%s: More data = %d. \n",
-                    __func__, mHotlistSsidLostMoreData);
+                    __FUNCTION__, mHotlistSsidLostMoreData);
             }
 
-            ALOGE("%s: Extract hotlist_ssid_Lost results.\n", __func__);
+            ALOGE("%s: Extract hotlist_ssid_Lost results.\n", __FUNCTION__);
             startingIndex = mHotlistSsidLostNumResults - numResults;
             ALOGE("%s: starting_index:%d",
-                __func__, startingIndex);
+                __FUNCTION__, startingIndex);
             ret = gscan_parse_hotlist_ssid_results(numResults,
                                                 mHotlistSsidLostResults,
                                                 startingIndex,
@@ -2056,7 +2056,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             {
                 /* RequestId is not provided by FW/Driver for this event */
                 ALOGE("%s: ATTR_GSCAN_RESULTS_REQUEST_ID not found. Continue.",
-                    __func__);
+                    __FUNCTION__);
                 id = mRequestId; /* Use the saved mRequestId instead. */
             } else {
                 id = nla_get_u32(
@@ -2065,7 +2065,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 /* If this is not for us, use the saved requestId */
                 if (id != mRequestId) {
                     ALOGE("%s: Event has Req. ID:%d <> ours:%d",
-                        __func__, id, mRequestId);
+                        __FUNCTION__, id, mRequestId);
                     id = mRequestId;
                 }
             }
@@ -2073,13 +2073,13 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_AVAILABLE not found",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             }
             numResults = nla_get_u32(tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_NUM_RESULTS_AVAILABLE]);
-            ALOGE("%s: number of results:%d", __func__, numResults);
+            ALOGE("%s: number of results:%d", __FUNCTION__, numResults);
 
             /* Get the memory size of previous fragments, if any. */
             sizeOfObtainedResults = mPnoNetworkFoundNumResults *
@@ -2102,7 +2102,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
 
             if (!mPnoNetworkFoundResults) {
                 ALOGE("%s: Failed to alloc memory for results array. Exit.\n",
-                    __func__);
+                    __FUNCTION__);
                 ret = WIFI_ERROR_OUT_OF_MEMORY;
                 break;
             }
@@ -2110,7 +2110,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             memset((u8 *)mPnoNetworkFoundResults + sizeOfObtainedResults, 0,
                     resultsBufSize - sizeOfObtainedResults);
 
-            ALOGE("%s: Num of AP FOUND results = %d. \n", __func__,
+            ALOGE("%s: Num of AP FOUND results = %d. \n", __FUNCTION__,
                                             mPnoNetworkFoundNumResults);
 
             /* To support fragmentation from firmware, monitor the
@@ -2121,7 +2121,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]) {
                 ALOGE("%s: GSCAN_RESULTS_NUM_RESULTS_MORE_DATA not"
-                    " found", __func__);
+                    " found", __FUNCTION__);
                 ret = WIFI_ERROR_INVALID_ARGS;
                 break;
             } else {
@@ -2129,13 +2129,13 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                     tbVendor[
                     QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_SCAN_RESULT_MORE_DATA]);
                 ALOGE("%s: More data = %d. \n",
-                    __func__, mPnoNetworkFoundMoreData);
+                    __FUNCTION__, mPnoNetworkFoundMoreData);
             }
 
-            ALOGE("%s: Extract PNO_NETWORK_FOUND results.\n", __func__);
+            ALOGE("%s: Extract PNO_NETWORK_FOUND results.\n", __FUNCTION__);
             startingIndex = mPnoNetworkFoundNumResults - numResults;
             ALOGE("%s: starting_index:%d",
-                __func__, startingIndex);
+                __FUNCTION__, startingIndex);
             ret = gscan_parse_pno_network_results(numResults,
                                                 mPnoNetworkFoundResults,
                                                 startingIndex,
@@ -2170,7 +2170,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             {
                 /* RequestId is not provided by FW/Driver for this event */
                 ALOGE("%s: ATTR_GSCAN_RESULTS_REQUEST_ID not found. Continue.",
-                    __func__);
+                    __FUNCTION__);
                 id = mRequestId; /* Use the saved mRequestId instead. */
             } else {
                 id = nla_get_u32(
@@ -2179,7 +2179,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
                 /* If this is not for us, use the saved requestId */
                 if (id != mRequestId) {
                     ALOGE("%s: Event has Req. ID:%d <> ours:%d",
-                        __func__, id, mRequestId);
+                        __FUNCTION__, id, mRequestId);
                     id = mRequestId;
                 }
             }
@@ -2189,7 +2189,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             if (ret)
             {
                 ALOGE("%s: gscan_parse_passpoint_network_result"
-                      "returned error: %d.\n", __func__, ret);
+                      "returned error: %d.\n", __FUNCTION__, ret);
                 break;
             }
             (*mHandler.on_passpoint_network_found)(id,
@@ -2213,7 +2213,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
         break;
         default:
             /* Error case should not happen print log */
-            ALOGE("%s: Wrong GScan subcmd received %d", __func__, mSubcmd);
+            ALOGE("%s: Wrong GScan subcmd received %d", __FUNCTION__, mSubcmd);
     }
 
     /* A parsing error occurred, do the cleanup of gscan result lists. */
@@ -2321,7 +2321,7 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
 
             default:
                 ALOGE("%s: Parsing err handler: wrong GScan subcmd "
-                    "received %d", __func__, mSubcmd);
+                    "received %d", __FUNCTION__, mSubcmd);
         }
     }
     return NL_SKIP;
diff --git a/qcwcn/wifi_hal/gscancommand.h b/qcwcn/wifi_hal/gscancommand.h
index 7f0600f..77acca7 100644
--- a/qcwcn/wifi_hal/gscancommand.h
+++ b/qcwcn/wifi_hal/gscancommand.h
@@ -71,7 +71,6 @@ typedef enum{
 /* Response and Event Callbacks */
 typedef struct {
     /* Various Events Callback */
-    void (*get_capabilities)(wifi_gscan_capabilities capabilities);
     void (*on_hotlist_ap_found)(wifi_request_id id,
         unsigned num_results, wifi_scan_result *results);
     void (*on_hotlist_ap_lost)(wifi_request_id id,
diff --git a/qcwcn/wifi_hal/wifi_hal.cpp b/qcwcn/wifi_hal/wifi_hal.cpp
index f000d4f..cbf3be2 100644
--- a/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/qcwcn/wifi_hal/wifi_hal.cpp
@@ -501,8 +501,6 @@ static int internal_valid_message_handler(nl_msg *msg, void *arg)
         ALOGI("event received %s", event.get_cmdString());
     }
 
-    ALOGI("event received %s, vendor_id = 0x%0x", event.get_cmdString(),
-            vendor_id);
     // event.log();
 
     bool dispatched = false;