diff options
author | taesub kim <taesub.kim@samsung.com> | 2016-07-21 16:10:59 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-07-21 16:10:59 -0700 |
commit | 365af507ae6183c5b240d65d47466b07d91027ee (patch) | |
tree | ca8ee6d71a9712a81bb508f0db7074f2090afe41 | |
parent | e70b86abc31de0593fbf98d276eed21c8c816962 (diff) | |
parent | f628758d7b9a89d502bae215aca2628f7cfc40e3 (diff) | |
download | connman-365af507ae6183c5b240d65d47466b07d91027ee.tar.gz connman-365af507ae6183c5b240d65d47466b07d91027ee.tar.bz2 connman-365af507ae6183c5b240d65d47466b07d91027ee.zip |
Merge "Call g_supplicant_interface_scan with scan_params" into tizensubmit/tizen/20160805.043406accepted/tizen/wearable/20160809.010632accepted/tizen/tv/20160809.010620accepted/tizen/mobile/20160809.010600accepted/tizen/ivi/20160809.010649accepted/tizen/common/20160805.125941
-rwxr-xr-x | packaging/connman.spec | 2 | ||||
-rwxr-xr-x | plugins/wifi.c | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec index 3e7c99c3..1fd96ebc 100755 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -4,7 +4,7 @@ Name: connman Version: 1.29 -Release: 14 +Release: 15 License: GPL-2.0+ Summary: Connection Manager Url: http://connman.net diff --git a/plugins/wifi.c b/plugins/wifi.c index 4050bce4..72eb64f7 100755 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -1930,19 +1930,9 @@ static int wifi_scan(enum connman_service_type type, reset_autoscan(device); -#if defined TIZEN_EXT - if (wifi->hidden) { - ret = g_supplicant_interface_scan(wifi->interface, scan_params, - scan_callback, device); - } - else { - ret = g_supplicant_interface_scan(wifi->interface, NULL, - scan_callback_hidden, device); - } -#else ret = g_supplicant_interface_scan(wifi->interface, scan_params, scan_callback, device); -#endif + if (ret == 0) { connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_WIFI, true); |