diff options
| author | cheoleun moon <chleun.moon@samsung.com> | 2016-12-20 17:15:16 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-12-20 17:15:16 -0800 |
| commit | 2729f6ef92b29beec5f4b7959847079481270699 (patch) | |
| tree | a63971312a075311123bd01081af7ccd178d8140 /plugins | |
| parent | 0732bde7ad2ba8e62ce94040b538260a6970629a (diff) | |
| parent | bc96c1660243612c6c1faca0d848778190dceec1 (diff) | |
| download | connman-2729f6ef92b29beec5f4b7959847079481270699.tar.gz connman-2729f6ef92b29beec5f4b7959847079481270699.tar.bz2 connman-2729f6ef92b29beec5f4b7959847079481270699.zip | |
Merge "[connman]:Fixed Double Scan Indication Event" into tizen
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/wifi.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c index 73584e6b..6a1ca367 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 |