diff options
| author | Subhani Shaik <subhanis@codeaurora.org> | 2017-07-27 19:19:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-27 19:19:15 +0000 |
| commit | 12acb720a9370784f03a27fe42fef5413d134aee (patch) | |
| tree | e34a466c5460624f5157289fb821ae877ef05b60 /qcwcn/wifi_hal/wificonfig.cpp | |
| parent | d6097712f56fde8d93c806134e276536ece8ac6a (diff) | |
| parent | 6feb8575f2805796579dad96c35f32feca47f55d (diff) | |
| download | wlan-12acb720a9370784f03a27fe42fef5413d134aee.tar.gz | |
Merge "WiFi-HAL: Map kernel returned error code to wifihal error" into oc-dr1-dev
am: 6feb8575f2
Change-Id: I144bce707bd54ca850fb020bd75e979731218924
Diffstat (limited to 'qcwcn/wifi_hal/wificonfig.cpp')
| -rw-r--r-- | qcwcn/wifi_hal/wificonfig.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/qcwcn/wifi_hal/wificonfig.cpp b/qcwcn/wifi_hal/wificonfig.cpp index bb5b8db..bd06d81 100644 --- a/qcwcn/wifi_hal/wificonfig.cpp +++ b/qcwcn/wifi_hal/wificonfig.cpp @@ -101,7 +101,7 @@ wifi_error wifi_extended_dtim_config_set(wifi_request_id id, cleanup: delete wifiConfigCommand; - return (wifi_error)ret; + return mapErrorKernelToWifiHAL(ret); } /* Set the country code to driver. */ @@ -152,7 +152,7 @@ wifi_error wifi_set_country_code(wifi_interface_handle iface, cleanup: delete wifiConfigCommand; - return (wifi_error)ret; + return mapErrorKernelToWifiHAL(ret); } wifi_error wifi_set_beacon_wifi_iface_stats_averaging_factor( @@ -220,7 +220,7 @@ wifi_error wifi_set_beacon_wifi_iface_stats_averaging_factor( cleanup: delete wifiConfigCommand; - return (wifi_error)ret; + return mapErrorKernelToWifiHAL(ret); } wifi_error wifi_set_guard_time(wifi_request_id id, @@ -284,7 +284,7 @@ wifi_error wifi_set_guard_time(wifi_request_id id, cleanup: delete wifiConfigCommand; - return (wifi_error)ret; + return mapErrorKernelToWifiHAL(ret); } wifi_error wifi_set_tx_power_limit(wifi_interface_handle handle, @@ -361,14 +361,12 @@ wifi_error wifi_set_tx_power_limit(wifi_interface_handle handle, ret = wifiConfigCommand->requestEvent(); if (ret != 0) { ALOGE("wifi_set_tx_power_limit(): requestEvent Error:%d", ret); - if (ret == -EOPNOTSUPP) - ret = WIFI_ERROR_NOT_SUPPORTED; goto cleanup; } cleanup: delete wifiConfigCommand; - return (wifi_error)ret; + return mapErrorKernelToWifiHAL(ret); } wifi_error wifi_reset_tx_power_limit(wifi_interface_handle handle) @@ -421,14 +419,12 @@ wifi_error wifi_reset_tx_power_limit(wifi_interface_handle handle) ret = wifiConfigCommand->requestEvent(); if (ret != 0) { ALOGE("wifi_set_tx_power_limit(): requestEvent Error:%d", ret); - if (ret == -EOPNOTSUPP) - ret = WIFI_ERROR_NOT_SUPPORTED; goto cleanup; } cleanup: delete wifiConfigCommand; - return (wifi_error)ret; + return mapErrorKernelToWifiHAL(ret); } WiFiConfigCommand::WiFiConfigCommand(wifi_handle handle, |