diff options
author | Maneesh Jain <maneesh.jain@samsung.com> | 2016-12-15 15:34:45 +0530 |
---|---|---|
committer | Maneesh Jain <maneesh.jain@samsung.com> | 2016-12-15 15:34:45 +0530 |
commit | 51e9e1c6b0e976bc052abf387181d8d0742e19b3 (patch) | |
tree | 92663e3503e4030ecc7451f0d55da0fd06763f4f | |
parent | 3600191c97d13f251399717a630264fbb9324799 (diff) | |
download | connman-51e9e1c6b0e976bc052abf387181d8d0742e19b3.tar.gz connman-51e9e1c6b0e976bc052abf387181d8d0742e19b3.tar.bz2 connman-51e9e1c6b0e976bc052abf387181d8d0742e19b3.zip |
[connman]:Fixed Double Scan Indication Event
Description: In specific case, CommMan issue the SSID based scan followed
by full channel scan. In that case, applicaiton receive the two scan
done event. To handle this , block the scan done event for SSID based
scan.
Change-Id: I5d502b654c2b1d62098c274aeb66d6c1227d56a4
Signed-off-by: Maneesh Jain <maneesh.jain@samsung.com>
-rwxr-xr-x | packaging/connman.spec | 2 | ||||
-rwxr-xr-x | plugins/wifi.c | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec index 1df7d8f1..ec6a4573 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 c0079b38..db4f5bf7 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 |