Merge "Call g_supplicant_interface_scan with scan_params" into tizen

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 3e7c99c..1fd96eb 100755 (executable)
--- 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 4050bce..72eb64f 100755 (executable)
--- 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);