summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpackaging/connman.spec2
-rwxr-xr-xplugins/wifi.c13
2 files changed, 10 insertions, 5 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec
index 1df7d8f..ec6a457 100755
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -4,7 +4,7 @@
Name: connman
Version: 1.29
-Release: 18
+Release: 19
License: GPL-2.0+
Summary: Connection Manager
Url: http://connman.net
diff --git a/plugins/wifi.c b/plugins/wifi.c
index c0079b3..db4f5bf 100755
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -1183,8 +1183,11 @@ static int throw_wifi_scan(struct connman_device *device,
if (wifi->tethering)
return -EBUSY;
-
+#if defined TIZEN_EXT
+ if (connman_device_get_scanning(device) && !wifi->allow_full_scan)
+#else
if (connman_device_get_scanning(device))
+#endif
return -EALREADY;
connman_device_ref(device);
@@ -1298,11 +1301,13 @@ static void scan_callback(int result, GSupplicantInterface *interface,
}
scanning = connman_device_get_scanning(device);
-
- if (scanning) {
+#if defined TIZEN_EXT
+ if (scanning && !wifi->allow_full_scan)
+#else
+ if (scanning)
+#endif
connman_device_set_scanning(device,
CONNMAN_SERVICE_TYPE_WIFI, false);
- }
if (result != -ENOLINK)
#if defined TIZEN_EXT