WiFi-Hal: Correct the mapping of wifihal error codes

Correct the mapping of wifihal error codes.

Bug: 70872935
Change-Id: Ic8bf0e6796a4e84ec6b540a34af1e202d9501d9e
(cherry-picked from 03ef1ab7c2dc2075d7691a396fc7f2547742ede6)

12 files changed, 120 insertions, 147 deletions

diff --git a/qcwcn/wifi_hal/cpp_bindings.cpp b/qcwcn/wifi_hal/cpp_bindings.cpp
index 7d360b0..6efec5a 100644
--- a/qcwcn/wifi_hal/cpp_bindings.cpp
+++ b/qcwcn/wifi_hal/cpp_bindings.cpp
@@ -1014,5 +1014,5 @@ wifi_error initialize_vendor_cmd(wifi_interface_handle iface,
 
 cleanup:
     delete *vCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
diff --git a/qcwcn/wifi_hal/gscan.cpp b/qcwcn/wifi_hal/gscan.cpp
index 4e9cfb8..46e0f89 100644
--- a/qcwcn/wifi_hal/gscan.cpp
+++ b/qcwcn/wifi_hal/gscan.cpp
@@ -163,7 +163,7 @@ wifi_error wifi_get_valid_channels(wifi_interface_handle handle,
 
 cleanup:
     delete gScanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_get_gscan_capabilities(wifi_interface_handle handle,
@@ -397,7 +397,8 @@ cleanup:
             __FUNCTION__, ret);
         gScanStartCmdEventHandler->disableEventHandling();
     }
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
+
 }
 
 wifi_error wifi_stop_gscan(wifi_request_id id,
@@ -473,7 +474,7 @@ wifi_error wifi_stop_gscan(wifi_request_id id,
 
 cleanup:
     delete gScanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* Set the GSCAN BSSID Hotlist. */
@@ -637,7 +638,7 @@ cleanup:
             __FUNCTION__, ret);
         gScanSetBssidHotlistCmdEventHandler->disableEventHandling();
     }
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_reset_bssid_hotlist(wifi_request_id id,
@@ -714,7 +715,7 @@ wifi_error wifi_reset_bssid_hotlist(wifi_request_id id,
 
 cleanup:
     delete gScanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* Set the GSCAN Significant AP Change list. */
@@ -889,7 +890,7 @@ cleanup:
         gScanSetSignificantChangeCmdEventHandler->disableEventHandling();
     }
     delete gScanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* Clear the GSCAN Significant AP change list. */
@@ -969,7 +970,7 @@ wifi_error wifi_reset_significant_change_handler(wifi_request_id id,
 
 cleanup:
     delete gScanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* Get the GSCAN cached scan results. */
@@ -1094,7 +1095,7 @@ wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface,
 cleanup:
     gScanCommand->freeRspParams(eGScanGetCachedResultsRspParams);
     delete gScanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* Random MAC OUI for PNO */
@@ -1149,7 +1150,7 @@ wifi_error wifi_set_scanning_mac_oui(wifi_interface_handle handle, oui scan_oui)
 
 cleanup:
     delete vCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 
@@ -1837,7 +1838,7 @@ cleanup:
             __FUNCTION__, ret);
         gScanSetPnoListCmdEventHandler->disableEventHandling();
     }
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* Reset the ePNO list - no ePNO networks should be matched after this */
@@ -1906,7 +1907,7 @@ wifi_error wifi_reset_epno_list(wifi_request_id id, wifi_interface_handle iface)
 
 cleanup:
     delete gScanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* Set the ePNO Passpoint List. */
@@ -2076,7 +2077,7 @@ cleanup:
             __FUNCTION__, ret);
         gScanPnoSetPasspointListCmdEventHandler->disableEventHandling();
     }
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_reset_passpoint_list(wifi_request_id id,
@@ -2163,7 +2164,7 @@ wifi_error wifi_reset_passpoint_list(wifi_request_id id,
 
 cleanup:
     delete gScanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error GScanCommand::allocCachedResultsTemp(int max,
diff --git a/qcwcn/wifi_hal/ifaceeventhandler.cpp b/qcwcn/wifi_hal/ifaceeventhandler.cpp
index ce6af43..e325a83 100644
--- a/qcwcn/wifi_hal/ifaceeventhandler.cpp
+++ b/qcwcn/wifi_hal/ifaceeventhandler.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014, 2018 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,6 +30,7 @@
 #define LOG_TAG  "WifiHAL"
 #include <utils/Log.h>
 #include <time.h>
+#include <errno.h>
 
 #include "ifaceeventhandler.h"
 
@@ -233,7 +234,7 @@ int WifihalGeneric::handleResponse(WifiEvent &reply)
                 if (!tb_vendor[QCA_WLAN_VENDOR_ATTR_FEATURE_SET])
                 {
                     ALOGE("%s: QCA_WLAN_VENDOR_ATTR_FEATURE_SET not found", __func__);
-                    return WIFI_ERROR_INVALID_ARGS;
+                    return -EINVAL;
                 }
                 mSet = nla_get_u32(tb_vendor[QCA_WLAN_VENDOR_ATTR_FEATURE_SET]);
                 ALOGV("Supported feature set : %x", mSet);
@@ -296,7 +297,7 @@ int WifihalGeneric::handleResponse(WifiEvent &reply)
                 {
                     ALOGE("%s: QCA_WLAN_VENDOR_ATTR_PACKET_FILTER_VERSION"
                           " not found", __FUNCTION__);
-                    return WIFI_ERROR_INVALID_ARGS;
+                    return -EINVAL;
                 }
                 filterVersion = nla_get_u32(
                        tb_vendor[QCA_WLAN_VENDOR_ATTR_PACKET_FILTER_VERSION]);
@@ -306,7 +307,7 @@ int WifihalGeneric::handleResponse(WifiEvent &reply)
                 {
                     ALOGE("%s: QCA_WLAN_VENDOR_ATTR_PACKET_FILTER_TOTAL_LENGTH"
                           " not found", __FUNCTION__);
-                    return WIFI_ERROR_INVALID_ARGS;
+                    return -EINVAL;
                 }
                 filterLength = nla_get_u32(
                     tb_vendor[QCA_WLAN_VENDOR_ATTR_PACKET_FILTER_TOTAL_LENGTH]);
@@ -325,7 +326,7 @@ int WifihalGeneric::handleResponse(WifiEvent &reply)
                 {
                     ALOGE("%s: QCA_WLAN_VENDOR_ATTR_DRV_INFO_BUS_SIZE"
                           " not found", __FUNCTION__);
-                    return WIFI_ERROR_INVALID_ARGS;
+                    return -EINVAL;
                 }
                 firmware_bus_max_size = nla_get_u32(
                        tb_vendor[QCA_WLAN_VENDOR_ATTR_DRV_INFO_BUS_SIZE]);
diff --git a/qcwcn/wifi_hal/llstats.cpp b/qcwcn/wifi_hal/llstats.cpp
index 7607cec..578b7a8 100644
--- a/qcwcn/wifi_hal/llstats.cpp
+++ b/qcwcn/wifi_hal/llstats.cpp
@@ -1294,7 +1294,7 @@ wifi_error wifi_set_link_stats(wifi_interface_handle iface,
         ALOGE("%s: requestResponse Error:%d",__FUNCTION__, ret);
 
 cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 //Implementation of the functions exposed in LLStats.h
@@ -1356,7 +1356,7 @@ wifi_error wifi_get_link_stats(wifi_request_id id,
         ret = LLCommand->notifyResponse();
 
 cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 
@@ -1412,5 +1412,5 @@ wifi_error wifi_clear_link_stats(wifi_interface_handle iface,
 
 cleanup:
     delete LLCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
diff --git a/qcwcn/wifi_hal/nan.cpp b/qcwcn/wifi_hal/nan.cpp
index 9fabd65..fb0e2d3 100644
--- a/qcwcn/wifi_hal/nan.cpp
+++ b/qcwcn/wifi_hal/nan.cpp
@@ -54,7 +54,7 @@ wifi_error nan_register_handler(wifi_interface_handle iface,
     }
 
     ret = nanCommand->setCallbackHandler(handlers);
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error nan_get_version(wifi_handle handle,
@@ -104,7 +104,7 @@ wifi_error nan_enable_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to send disable request to the wifi driver.*/
@@ -146,7 +146,7 @@ wifi_error nan_disable_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to send publish request to the wifi driver.*/
@@ -189,7 +189,7 @@ wifi_error nan_publish_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to send publish cancel to the wifi driver.*/
@@ -232,7 +232,7 @@ wifi_error nan_publish_cancel_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to send Subscribe request to the wifi driver.*/
@@ -275,7 +275,7 @@ wifi_error nan_subscribe_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to cancel subscribe to the wifi driver.*/
@@ -318,7 +318,7 @@ wifi_error nan_subscribe_cancel_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to send NAN follow up request to the wifi driver.*/
@@ -361,7 +361,7 @@ wifi_error nan_transmit_followup_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to send NAN statistics request to the wifi driver.*/
@@ -404,7 +404,7 @@ wifi_error nan_stats_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to send NAN configuration request to the wifi driver.*/
@@ -447,7 +447,7 @@ wifi_error nan_config_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to send NAN request to the wifi driver.*/
@@ -490,7 +490,7 @@ wifi_error nan_tca_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to send NAN Beacon sdf payload to the wifi driver.
@@ -536,7 +536,7 @@ wifi_error nan_beacon_sdf_payload_request(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error nan_get_sta_parameter(transaction_id id,
@@ -560,7 +560,7 @@ wifi_error nan_get_sta_parameter(transaction_id id,
     }
 
 cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to get NAN capabilities */
@@ -602,7 +602,7 @@ wifi_error nan_get_capabilities(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to get NAN capabilities */
@@ -689,7 +689,7 @@ wifi_error nan_initialize_vendor_cmd(wifi_interface_handle iface,
 
 cleanup:
     delete *nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error nan_data_interface_create(transaction_id id,
@@ -710,7 +710,7 @@ wifi_error nan_data_interface_create(transaction_id id,
                                     &nanCommand);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: Initialization failed", __FUNCTION__);
-        return mapKernelErrortoWifiHalError(ret);
+        return ret;
     }
 
     /* Add the vendor specific attributes for the NL command. */
@@ -738,7 +738,7 @@ wifi_error nan_data_interface_create(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error nan_data_interface_delete(transaction_id id,
@@ -758,7 +758,7 @@ wifi_error nan_data_interface_delete(transaction_id id,
                                     &nanCommand);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: Initialization failed", __FUNCTION__);
-        return mapKernelErrortoWifiHalError(ret);
+        return ret;
     }
 
     /* Add the vendor specific attributes for the NL command. */
@@ -786,7 +786,7 @@ wifi_error nan_data_interface_delete(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error nan_data_request_initiator(transaction_id id,
@@ -805,7 +805,7 @@ wifi_error nan_data_request_initiator(transaction_id id,
                                     &nanCommand);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: Initialization failed", __FUNCTION__);
-        return mapKernelErrortoWifiHalError(ret);
+        return ret;
     }
 
     if ((msg->cipher_type != NAN_CIPHER_SUITE_SHARED_KEY_NONE) &&
@@ -921,7 +921,7 @@ wifi_error nan_data_request_initiator(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error nan_data_indication_response(transaction_id id,
@@ -940,7 +940,7 @@ wifi_error nan_data_indication_response(transaction_id id,
                                     &nanCommand);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: Initialization failed", __FUNCTION__);
-        return mapKernelErrortoWifiHalError(ret);
+        return ret;
     }
 
     if ((msg->cipher_type != NAN_CIPHER_SUITE_SHARED_KEY_NONE) &&
@@ -1038,7 +1038,7 @@ wifi_error nan_data_indication_response(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error nan_data_end(transaction_id id,
@@ -1057,7 +1057,7 @@ wifi_error nan_data_end(transaction_id id,
                                     &nanCommand);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: Initialization failed", __FUNCTION__);
-        return mapKernelErrortoWifiHalError(ret);
+        return ret;
     }
 
     /* Add the vendor specific attributes for the NL command. */
@@ -1085,7 +1085,7 @@ wifi_error nan_data_end(transaction_id id,
 
 cleanup:
     delete nanCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 // Implementation related to nan class common functions
diff --git a/qcwcn/wifi_hal/nan_req.cpp b/qcwcn/wifi_hal/nan_req.cpp
index 03992fe..8ab3a51 100644
--- a/qcwcn/wifi_hal/nan_req.cpp
+++ b/qcwcn/wifi_hal/nan_req.cpp
@@ -1445,7 +1445,7 @@ wifi_error NanCommand::requestEvent()
 
     if (!mInfo->cmd_sock) {
         ALOGE("%s: Command socket is null",__func__);
-        res = WIFI_ERROR_NOT_SUPPORTED;
+        res = WIFI_ERROR_OUT_OF_MEMORY;
         goto out;
     }
 
diff --git a/qcwcn/wifi_hal/rssi_monitor.cpp b/qcwcn/wifi_hal/rssi_monitor.cpp
index c55e074..20d5aa3 100644
--- a/qcwcn/wifi_hal/rssi_monitor.cpp
+++ b/qcwcn/wifi_hal/rssi_monitor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015, 2018 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -266,7 +266,7 @@ wifi_error wifi_start_rssi_monitoring(wifi_request_id id,
                                 &vCommand);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: Initialization failed", __FUNCTION__);
-        return mapKernelErrortoWifiHalError(ret);
+        return ret;
     }
 
     ALOGV("%s: Max RSSI:%d Min RSSI:%d", __FUNCTION__,
@@ -312,7 +312,7 @@ wifi_error wifi_start_rssi_monitoring(wifi_request_id id,
 
 cleanup:
     delete vCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_stop_rssi_monitoring(wifi_request_id id,
@@ -341,7 +341,7 @@ wifi_error wifi_stop_rssi_monitoring(wifi_request_id id,
                                 &vCommand);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: Initialization failed", __FUNCTION__);
-        return mapKernelErrortoWifiHalError(ret);
+        return ret;
     }
 
     /* Add the vendor specific attributes for the NL command. */
@@ -368,5 +368,5 @@ wifi_error wifi_stop_rssi_monitoring(wifi_request_id id,
 
 cleanup:
     delete vCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
diff --git a/qcwcn/wifi_hal/rtt.cpp b/qcwcn/wifi_hal/rtt.cpp
index 665ffab..b295ab6 100644
--- a/qcwcn/wifi_hal/rtt.cpp
+++ b/qcwcn/wifi_hal/rtt.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014, 2018 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -68,19 +68,15 @@ wifi_error wifi_get_rtt_capabilities(wifi_interface_handle iface,
         lowiWifiHalApi->get_rtt_capabilities == NULL) {
         ALOGE("wifi_get_rtt_capabilities: getLowiCallbackTable returned NULL or "
             "the function pointer is NULL. Exit.");
-        ret = WIFI_ERROR_NOT_SUPPORTED;
-        goto cleanup;
+        return WIFI_ERROR_NOT_SUPPORTED;
     }
 
     ret = (wifi_error)lowiWifiHalApi->get_rtt_capabilities(iface, capabilities);
-    if (ret != WIFI_SUCCESS) {
+    if (ret != WIFI_SUCCESS)
         ALOGE("wifi_get_rtt_capabilities: lowi_wifihal_get_rtt_capabilities "
             "returned error:%d. Exit.", ret);
-        goto cleanup;
-    }
 
-cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* API to request RTT measurement */
@@ -127,21 +123,17 @@ wifi_error wifi_rtt_range_request(wifi_request_id id,
         lowiWifiHalApi->rtt_range_request == NULL) {
         ALOGE("wifi_rtt_range_request: getLowiCallbackTable returned NULL or "
             "the function pointer is NULL. Exit.");
-        ret = WIFI_ERROR_NOT_SUPPORTED;
-        goto cleanup;
+        return WIFI_ERROR_NOT_SUPPORTED;
     }
 
     ret = (wifi_error)lowiWifiHalApi->rtt_range_request(id, iface,
                                                         num_rtt_config,
                                                         rtt_config, handler);
-    if (ret != WIFI_SUCCESS) {
+    if (ret != WIFI_SUCCESS)
         ALOGE("wifi_rtt_range_request: lowi_wifihal_rtt_range_request "
             "returned error:%d. Exit.", ret);
-        goto cleanup;
-    }
 
-cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* API to cancel RTT measurements */
@@ -181,19 +173,15 @@ wifi_error wifi_rtt_range_cancel(wifi_request_id id,
         lowiWifiHalApi->rtt_range_cancel == NULL) {
         ALOGE("wifi_rtt_range_cancel: getLowiCallbackTable returned NULL or "
             "the function pointer is NULL. Exit.");
-        ret = WIFI_ERROR_NOT_SUPPORTED;
-        goto cleanup;
+        return WIFI_ERROR_NOT_SUPPORTED;
     }
 
     ret = (wifi_error)lowiWifiHalApi->rtt_range_cancel(id, num_devices, addr);
-    if (ret != WIFI_SUCCESS) {
+    if (ret != WIFI_SUCCESS)
         ALOGE("wifi_rtt_range_cancel: lowi_wifihal_rtt_range_cancel "
             "returned error:%d. Exit.", ret);
-        goto cleanup;
-    }
 
-cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 // API to configure the LCI. Used in RTT Responder mode only
@@ -225,18 +213,14 @@ wifi_error wifi_set_lci(wifi_request_id id, wifi_interface_handle iface,
         lowiWifiHalApi->rtt_set_lci == NULL) {
         ALOGE("%s: getLowiCallbackTable returned NULL or "
             "the function pointer is NULL. Exit.", __FUNCTION__);
-        ret = WIFI_ERROR_NOT_SUPPORTED;
-        goto cleanup;
+        return WIFI_ERROR_NOT_SUPPORTED;
     }
 
     ret = lowiWifiHalApi->rtt_set_lci(id, iface, lci);
-    if (ret != WIFI_SUCCESS) {
+    if (ret != WIFI_SUCCESS)
         ALOGE("%s: returned error:%d. Exit.", __FUNCTION__, ret);
-        goto cleanup;
-    }
 
-cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 // API to configure the LCR. Used in RTT Responder mode only.
@@ -268,18 +252,14 @@ wifi_error wifi_set_lcr(wifi_request_id id, wifi_interface_handle iface,
         lowiWifiHalApi->rtt_set_lcr == NULL) {
         ALOGE("%s: getLowiCallbackTable returned NULL or "
             "the function pointer is NULL. Exit.", __FUNCTION__);
-        ret = WIFI_ERROR_NOT_SUPPORTED;
-        goto cleanup;
+        return WIFI_ERROR_NOT_SUPPORTED;
     }
 
     ret = lowiWifiHalApi->rtt_set_lcr(id, iface, lcr);
-    if (ret != WIFI_SUCCESS) {
+    if (ret != WIFI_SUCCESS)
         ALOGE("%s: returned error:%d. Exit.", __FUNCTION__, ret);
-        goto cleanup;
-    }
 
-cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*
@@ -304,18 +284,14 @@ wifi_error wifi_rtt_get_responder_info(wifi_interface_handle iface,
         lowiWifiHalApi->rtt_get_responder_info == NULL) {
         ALOGE("%s: getLowiCallbackTable returned NULL or "
             "the function pointer is NULL. Exit.", __FUNCTION__);
-        ret = WIFI_ERROR_NOT_SUPPORTED;
-        goto cleanup;
+        return WIFI_ERROR_NOT_SUPPORTED;
     }
 
     ret = lowiWifiHalApi->rtt_get_responder_info(iface, responder_info);
-    if (ret != WIFI_SUCCESS) {
+    if (ret != WIFI_SUCCESS)
         ALOGE("%s: returned error:%d. Exit.", __FUNCTION__, ret);
-        goto cleanup;
-    }
 
-cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /**
@@ -347,20 +323,16 @@ wifi_error wifi_enable_responder(wifi_request_id id,
         lowiWifiHalApi->enable_responder == NULL) {
         ALOGE("%s: getLowiCallbackTable returned NULL or "
             "the function pointer is NULL. Exit.", __FUNCTION__);
-        ret = WIFI_ERROR_NOT_SUPPORTED;
-        goto cleanup;
+        return WIFI_ERROR_NOT_SUPPORTED;
     }
 
     ret = lowiWifiHalApi->enable_responder(id, iface, channel_hint,
                                            max_duration_seconds,
                                            responder_info);
-    if (ret != WIFI_SUCCESS) {
+    if (ret != WIFI_SUCCESS)
         ALOGE("%s: returned error:%d. Exit.", __FUNCTION__, ret);
-        goto cleanup;
-    }
 
-cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 
@@ -386,15 +358,12 @@ wifi_error wifi_disable_responder(wifi_request_id id,
         lowiWifiHalApi->disable_responder == NULL) {
         ALOGE("%s: getLowiCallbackTable returned NULL or "
             "the function pointer is NULL. Exit.", __FUNCTION__);
-        ret = WIFI_ERROR_NOT_SUPPORTED;
-        goto cleanup;
+        return WIFI_ERROR_NOT_SUPPORTED;
     }
 
     ret = lowiWifiHalApi->disable_responder(id, iface);
-    if (ret != WIFI_SUCCESS) {
+    if (ret != WIFI_SUCCESS)
         ALOGE("%s: returned error:%d. Exit.", __FUNCTION__, ret);
-        goto cleanup;
-    }
-cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+
+    return ret;
 }
diff --git a/qcwcn/wifi_hal/tdls.cpp b/qcwcn/wifi_hal/tdls.cpp
index ff4fe12..f12816f 100644
--- a/qcwcn/wifi_hal/tdls.cpp
+++ b/qcwcn/wifi_hal/tdls.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014, 2018 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -421,7 +421,7 @@ wifi_error wifi_enable_tdls(wifi_interface_handle iface,
         ALOGE("%s: requestResponse Error:%d", __FUNCTION__, ret);
 
 cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* wifi_disable_tdls - disables TDLS-auto mode for a specific route
@@ -474,7 +474,7 @@ wifi_error wifi_disable_tdls(wifi_interface_handle iface, mac_addr addr)
 
 cleanup:
     delete pTdlsCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* wifi_get_tdls_status - allows getting the status of TDLS for a specific
@@ -523,7 +523,7 @@ wifi_error wifi_get_tdls_status(wifi_interface_handle iface, mac_addr addr,
     pTdlsCommand->getStatusRspParams(status);
 
 cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* return the current HW + Firmware combination's TDLS capabilities */
@@ -568,5 +568,5 @@ cleanup:
     if (ret != WIFI_SUCCESS)
         memset(capabilities, 0, sizeof(wifi_tdls_capabilities));
     delete pTdlsCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
diff --git a/qcwcn/wifi_hal/wifi_hal.cpp b/qcwcn/wifi_hal/wifi_hal.cpp
index bb42d93..3e96fa9 100644
--- a/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/qcwcn/wifi_hal/wifi_hal.cpp
@@ -191,7 +191,7 @@ static wifi_error acquire_supported_features(wifi_interface_handle iface,
     supportedFeatures.getResponseparams(set);
 
 cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 static wifi_error wifi_get_capabilities(wifi_interface_handle handle)
@@ -257,7 +257,7 @@ static wifi_error get_firmware_bus_max_size_supported(
     info->firmware_bus_max_size = busSizeSupported.getBusSize();
 
 cleanup:
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 static wifi_error wifi_init_user_sock(hal_info *info)
@@ -735,8 +735,9 @@ static int wifi_add_membership(wifi_handle handle, const char *group)
     }
 
     int ret = nl_socket_add_membership(info->event_sock, id);
-    if (ret < 0)
+    if (ret < 0) {
         ALOGE("Could not add membership to group %s", group);
+    }
 
     return ret;
 }
@@ -1156,7 +1157,7 @@ wifi_error wifi_get_iface_name(wifi_interface_handle handle, char *name,
 wifi_error wifi_get_supported_feature_set(wifi_interface_handle iface,
         feature_set *set)
 {
-    wifi_error ret;
+    int ret = 0;
     wifi_handle handle = getWifiHandle(iface);
     *set = 0;
     hal_info *info = getHalInfo(handle);
@@ -1231,7 +1232,7 @@ cleanup:
     delete vCommand;
     if (ret)
         *set_size = 0;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 
@@ -1277,7 +1278,7 @@ wifi_error wifi_set_nodfs_flag(wifi_interface_handle handle, u32 nodfs)
 
 cleanup:
     delete vCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_start_sending_offloaded_packet(wifi_request_id id,
@@ -1297,7 +1298,7 @@ wifi_error wifi_start_sending_offloaded_packet(wifi_request_id id,
                                 &vCommand);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: Initialization failed", __func__);
-        return mapKernelErrortoWifiHalError(ret);
+        return ret;
     }
 
     ALOGV("ip packet length : %u\nIP Packet:", ip_packet_len);
@@ -1355,7 +1356,7 @@ wifi_error wifi_start_sending_offloaded_packet(wifi_request_id id,
 
 cleanup:
     delete vCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_stop_sending_offloaded_packet(wifi_request_id id,
@@ -1370,7 +1371,7 @@ wifi_error wifi_stop_sending_offloaded_packet(wifi_request_id id,
                                 &vCommand);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: Initialization failed", __func__);
-        return mapKernelErrortoWifiHalError(ret);
+        return ret;
     }
 
     /* Add the vendor specific attributes for the NL command. */
@@ -1398,7 +1399,7 @@ wifi_error wifi_stop_sending_offloaded_packet(wifi_request_id id,
 
 cleanup:
     delete vCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 static wifi_error wifi_set_packet_filter(wifi_interface_handle iface,
@@ -1424,7 +1425,7 @@ static wifi_error wifi_set_packet_filter(wifi_interface_handle iface,
                                     &vCommand);
         if (ret != WIFI_SUCCESS) {
             ALOGE("%s: Initialization failed", __FUNCTION__);
-            return mapKernelErrortoWifiHalError(ret);
+            return ret;
         }
 
         /* Add the vendor specific attributes for the NL command. */
@@ -1480,7 +1481,7 @@ static wifi_error wifi_set_packet_filter(wifi_interface_handle iface,
 cleanup:
     if (vCommand)
         delete vCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 static wifi_error wifi_get_packet_filter_capabilities(
@@ -1546,7 +1547,7 @@ static wifi_error wifi_get_packet_filter_capabilities(
     *max_len = vCommand->getFilterLength();
 cleanup:
     delete vCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 
@@ -1562,7 +1563,7 @@ static wifi_error wifi_configure_nd_offload(wifi_interface_handle iface,
                                 &vCommand);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: Initialization failed", __func__);
-        return mapKernelErrortoWifiHalError(ret);
+        return ret;
     }
 
     ALOGV("ND offload : %s", enable?"Enable":"Disable");
@@ -1582,5 +1583,5 @@ static wifi_error wifi_configure_nd_offload(wifi_interface_handle iface,
 
 cleanup:
     delete vCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
diff --git a/qcwcn/wifi_hal/wificonfig.cpp b/qcwcn/wifi_hal/wificonfig.cpp
index 58d3d09..9d1fef2 100644
--- a/qcwcn/wifi_hal/wificonfig.cpp
+++ b/qcwcn/wifi_hal/wificonfig.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015, 2018 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -102,7 +102,7 @@ wifi_error wifi_extended_dtim_config_set(wifi_request_id id,
 
 cleanup:
     delete wifiConfigCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /* Set the country code to driver. */
@@ -155,7 +155,7 @@ wifi_error wifi_set_country_code(wifi_interface_handle iface,
 
 cleanup:
     delete wifiConfigCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_set_beacon_wifi_iface_stats_averaging_factor(
@@ -223,7 +223,7 @@ wifi_error wifi_set_beacon_wifi_iface_stats_averaging_factor(
 
 cleanup:
     delete wifiConfigCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_set_guard_time(wifi_request_id id,
@@ -287,7 +287,7 @@ wifi_error wifi_set_guard_time(wifi_request_id id,
 
 cleanup:
     delete wifiConfigCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_select_tx_power_scenario(wifi_interface_handle handle,
@@ -374,7 +374,7 @@ wifi_error wifi_select_tx_power_scenario(wifi_interface_handle handle,
 
 cleanup:
     delete wifiConfigCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_reset_tx_power_scenario(wifi_interface_handle handle)
@@ -432,7 +432,7 @@ wifi_error wifi_reset_tx_power_scenario(wifi_interface_handle handle)
 
 cleanup:
     delete wifiConfigCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 WiFiConfigCommand::WiFiConfigCommand(wifi_handle handle,
diff --git a/qcwcn/wifi_hal/wifilogger.cpp b/qcwcn/wifi_hal/wifilogger.cpp
index 4e896e0..9e1a9a7 100644
--- a/qcwcn/wifi_hal/wifilogger.cpp
+++ b/qcwcn/wifi_hal/wifilogger.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015, 2018 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -146,9 +146,8 @@ wifi_error wifi_start_logging(wifi_interface_handle iface,
     rb_start_logging(&info->rb_infos[ring_id], verbose_level,
                     flags, max_interval_sec, min_data_size);
 cleanup:
-    if (wifiLoggerCommand)
-        delete wifiLoggerCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    delete wifiLoggerCommand;
+    return ret;
 }
 
 /*  Function to get each ring related info */
@@ -262,7 +261,7 @@ wifi_error wifi_get_logger_supported_feature_set(wifi_interface_handle iface,
 
 cleanup:
     delete wifiLoggerCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 /*  Function to get the data in each ring for the given ring ID.*/
@@ -324,7 +323,7 @@ wifi_error wifi_get_ring_data(wifi_interface_handle iface,
 
 cleanup:
     delete wifiLoggerCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 void WifiLoggerCommand::setVersionInfo(char *buffer, int buffer_size) {
@@ -388,7 +387,8 @@ wifi_error wifi_get_firmware_version(wifi_interface_handle iface,
 
 cleanup:
     delete wifiLoggerCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
+
 }
 
 /*  Function to get wlan driver version.*/
@@ -445,9 +445,10 @@ wifi_error wifi_get_driver_version(wifi_interface_handle iface,
     ret = wifiLoggerCommand->requestResponse();
     if (ret != WIFI_SUCCESS)
         ALOGE("%s: Error %d happened. ", __FUNCTION__, ret);
+
 cleanup:
     delete wifiLoggerCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 
@@ -512,7 +513,7 @@ wifi_error wifi_get_firmware_memory_dump(wifi_interface_handle iface,
 
 cleanup:
     delete wifiLoggerCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 wifi_error wifi_set_log_handler(wifi_request_id id,
@@ -1480,7 +1481,7 @@ wifi_error wifi_get_wake_reason_stats(wifi_interface_handle iface,
 
 cleanup:
     delete wifiLoggerCommand;
-    return mapKernelErrortoWifiHalError(ret);
+    return ret;
 }
 
 void WifiLoggerCommand::getWakeStatsRspParams(