diff options
author | Jaehyun Kim <jeik01.kim@samsung.com> | 2017-01-05 00:12:34 +0900 |
---|---|---|
committer | Jaehyun Kim <jeik01.kim@samsung.com> | 2017-01-05 00:22:45 +0900 |
commit | 7ea58cc3097778f08b35f24a88d6e36cb4066a62 (patch) | |
tree | e444c7cad040ca97681e72a8de3f3b97145ac84b /plugins | |
parent | 97d882d9b7a5bb5e47e4391ce8731cffe152c81d (diff) | |
download | connman-7ea58cc3097778f08b35f24a88d6e36cb4066a62.tar.gz connman-7ea58cc3097778f08b35f24a88d6e36cb4066a62.tar.bz2 connman-7ea58cc3097778f08b35f24a88d6e36cb4066a62.zip |
Fix abnormal wifi deactivationsubmit/tizen_3.0/20170106.055933accepted/tizen/3.0/wearable/20170106.095217accepted/tizen/3.0/tv/20170106.095153accepted/tizen/3.0/mobile/20170106.095138accepted/tizen/3.0/ivi/20170106.095236accepted/tizen/3.0/common/20170109.200255
The scan done event for SSID based scan was blocked to prevent Double Scan Indication Event
but It can cause abnormal wifi deactivation because the scanning flag may not be cleared correctly.
So the existing solution is removed and applied other solution.
Change-Id: I720faece9cb423e65f23292d4c48cd562e4f2f70
Diffstat (limited to 'plugins')
-rwxr-xr-x | plugins/wifi.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c index 76a1d7a0..562c9b7c 100755 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -1183,11 +1183,8 @@ 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); @@ -1301,11 +1298,8 @@ static void scan_callback(int result, GSupplicantInterface *interface, } scanning = connman_device_get_scanning(device); -#if defined TIZEN_EXT - if (scanning && wifi && !wifi->allow_full_scan) -#else + if (scanning) -#endif connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_WIFI, false); @@ -1330,6 +1324,7 @@ static void scan_callback(int result, GSupplicantInterface *interface, DBG("Trigger Full Channel Scan"); throw_wifi_scan(device, scan_callback); wifi->allow_full_scan = FALSE; + connman_technology_set_allow_scandone_signal(TRUE); } if (wifi && wifi->scan_pending_network && result != -EIO) { network_connect(wifi->scan_pending_network); @@ -1946,6 +1941,7 @@ static int wifi_scan(enum connman_service_type type, backgroung Scan feature.Tizen has added the BG Scan feature in net-config To sync with up ConnMan, we need to issue the Full Scan after SSID specific scan.*/ wifi->allow_full_scan = TRUE; + connman_technology_set_allow_scandone_signal(FALSE); #endif reset_autoscan(device); |