summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcheoleun moon <chleun.moon@samsung.com>2016-12-21 01:13:43 (GMT)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2016-12-21 01:13:43 (GMT)
commitc39ec59afa0a41d5cfcaf872ffbc760404d7daab (patch)
tree86296bd6c83e8ee1e4fbcf9724ab58d172a57629
parentee0ee630d718d1d7784c5ab2cd4b2daf6500f34b (diff)
parent51e9e1c6b0e976bc052abf387181d8d0742e19b3 (diff)
downloadconnman-c39ec59afa0a41d5cfcaf872ffbc760404d7daab.zip
connman-c39ec59afa0a41d5cfcaf872ffbc760404d7daab.tar.gz
connman-c39ec59afa0a41d5cfcaf872ffbc760404d7daab.tar.bz2
Merge "[connman]:Fixed Double Scan Indication Event" into tizen_3.0submit/tizen_3.0/20161221.012149
-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 73584e6..6a1ca36 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