diff options
| author | cheoleun moon <chleun.moon@samsung.com> | 2016-10-05 18:01:29 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-10-05 18:01:29 -0700 |
| commit | a41da5aab565ad5a682aad5142379aae398bb5ba (patch) | |
| tree | f68b8eb24ff7c283858ef9728a5ee907fac24787 | |
| parent | b98026b7b4bf550e955d58dd3c672d7382a685e7 (diff) | |
| parent | ffdbdd50be19d7debc9d749922a874761fcd2223 (diff) | |
| download | connman-a41da5aab565ad5a682aad5142379aae398bb5ba.tar.gz connman-a41da5aab565ad5a682aad5142379aae398bb5ba.tar.bz2 connman-a41da5aab565ad5a682aad5142379aae398bb5ba.zip | |
Merge "[connman]: Fixed Scan Issue" into tizensubmit/tizen_3.0_wearable/20161015.000001submit/tizen_3.0_tv/20161015.000001submit/tizen_3.0_mobile/20161015.000001submit/tizen_3.0_ivi/20161010.000001submit/tizen/20161006.010203accepted/tizen/wearable/20161006.080157accepted/tizen/tv/20161006.080141accepted/tizen/mobile/20161006.080107accepted/tizen/ivi/20161006.080215accepted/tizen/common/20161006.153612accepted/tizen/3.0/wearable/20161015.082011accepted/tizen/3.0/tv/20161016.004154accepted/tizen/3.0/mobile/20161015.032812accepted/tizen/3.0/ivi/20161011.043852
| -rwxr-xr-x | packaging/connman.spec | 2 | ||||
| -rwxr-xr-x | plugins/wifi.c | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec index 064fec4c..953d5184 100755 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -4,7 +4,7 @@ Name: connman Version: 1.29 -Release: 17 +Release: 18 License: GPL-2.0+ Summary: Connection Manager Url: http://connman.net diff --git a/plugins/wifi.c b/plugins/wifi.c index 72eb64f7..05eb47ea 100755 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -131,6 +131,7 @@ struct wifi_data { #if defined TIZEN_EXT int assoc_retry_count; struct connman_network *scan_pending_network; + bool allow_full_scan; #endif }; @@ -144,6 +145,7 @@ static gboolean found_with_first_scan = false; static gboolean is_wifi_notifier_registered = false; #endif + static GList *iface_list = NULL; static GList *pending_wifi_device = NULL; @@ -1319,6 +1321,11 @@ static void scan_callback(int result, GSupplicantInterface *interface, connman_device_unref(device); #if defined TIZEN_EXT + if (wifi && wifi->allow_full_scan) { + DBG("Trigger Full Channel Scan"); + throw_wifi_scan(device, scan_callback); + wifi->allow_full_scan = FALSE; + } if (wifi && wifi->scan_pending_network && result != -EIO) { network_connect(wifi->scan_pending_network); wifi->scan_pending_network = NULL; @@ -1928,6 +1935,13 @@ static int wifi_scan(enum connman_service_type type, connman_device_ref(device); +#if defined TIZEN_EXT + /*To allow the Full Scan after ssid based scan, set the flag here + It is required because Tizen does not use the ConnMan specific + 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; +#endif reset_autoscan(device); ret = g_supplicant_interface_scan(wifi->interface, scan_params, |