diff options
author | Pierre Vandwalle <vandwalle@google.com> | 2015-05-14 18:06:04 +0000 |
---|---|---|
committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2015-05-14 18:06:04 +0000 |
commit | 778c11b66229c22c2ed073b69281c212a7fed5ca (patch) | |
tree | 271edcc1ebcd8c59e7d8f665372a806a1bb2d762 | |
parent | 22be4eab58f47ab54ee84cc3c0d375fd011edc64 (diff) | |
parent | 8413100c292c64a6562cd975689652cd8aeebfe3 (diff) | |
download | hardware_broadcom_wlan-778c11b66229c22c2ed073b69281c212a7fed5ca.zip hardware_broadcom_wlan-778c11b66229c22c2ed073b69281c212a7fed5ca.tar.gz hardware_broadcom_wlan-778c11b66229c22c2ed073b69281c212a7fed5ca.tar.bz2 |
Merge "fix reseting pno list" into m-wireless-dev
-rw-r--r-- | bcmdhd/wifi_hal/gscan.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index 2aa686b..3ece5bf 100644 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -1565,22 +1565,19 @@ wifi_error wifi_reset_epno_list(wifi_request_id id, wifi_interface_handle iface) cmd->releaseRef(); return WIFI_SUCCESS; } - return WIFI_ERROR_INVALID_ARGS; } wifi_error wifi_set_epno_list(wifi_request_id id, wifi_interface_handle iface, int num_networks, wifi_epno_network *networks, wifi_epno_handler handler) { - - if (num_networks == 0 || networks == NULL) { - return wifi_reset_epno_list(id, iface); - } - wifi_handle handle = getWifiHandle(iface); ePNOCommand *cmd = new ePNOCommand(iface, id, num_networks, networks, handler); wifi_register_cmd(handle, id, cmd); + if (num_networks == 0 || networks == NULL) { + return wifi_reset_epno_list(id, iface); + } return (wifi_error)cmd->start(); } |