Merge "Revise background scan routine" into tizen

[platform/core/connectivity/net-config.git] / src / wifi-state.c

diff --git a/src/wifi-state.c b/src/wifi-state.c
index d6bc33e..5d89458 100755 (executable)
--- a/src/wifi-state.c
+++ b/src/wifi-state.c
@@ -44,7 +44,7 @@ static GSList *notifier_list = NULL;
 static guint network_connected_popup_timer_id = 0;
 static gboolean block_network_connected_popup = FALSE;
 
-static const char *_convert_wifi_service_state_to_string(wifi_service_state_e wifi_service_state_type)
+char *_convert_wifi_service_state_to_string(wifi_service_state_e wifi_service_state_type)
 {
        switch (wifi_service_state_type) {
        case NETCONFIG_WIFI_UNKNOWN:
@@ -67,7 +67,7 @@ static const char *_convert_wifi_service_state_to_string(wifi_service_state_e wi
        return "Invalid parameter";
 }
 
-static const char *_convert_wifi_technology_state_to_string(wifi_tech_state_e wifi_tech_state_type)
+char *_convert_wifi_technology_state_to_string(wifi_tech_state_e wifi_tech_state_type)
 {
        switch (wifi_tech_state_type) {
        case NETCONFIG_WIFI_TECH_UNKNOWN:
@@ -488,6 +488,7 @@ void wifi_state_update_power_state(gboolean powered)
                        netconfig_set_system_event(SYS_EVT_WIFI_STATE, EKEY_WIFI_STATE, EVAL_WIFI_ON);
 
                        netconfig_wifi_bgscan_stop();
+                       netconfig_wifi_bgscan_set_interval(SCAN_EXPONENTIAL_MIN);
                        netconfig_wifi_bgscan_start(TRUE);
 
                        /* Add callback to track change in notification setting */
@@ -511,7 +512,6 @@ void wifi_state_update_power_state(gboolean powered)
 
                netconfig_set_system_event(SYS_EVT_WIFI_STATE, EKEY_WIFI_STATE, EVAL_WIFI_OFF);
 
-               netconfig_wifi_set_bgscan_pause(FALSE);
                netconfig_wifi_bgscan_stop();
 
                _set_bss_found(FALSE);
@@ -613,14 +613,12 @@ void wifi_state_set_service_state(wifi_service_state_e new_state)
 
                netconfig_wifi_indicator_stop();
 
-               netconfig_wifi_set_bgscan_pause(FALSE);
-
                netconfig_wifi_bgscan_stop();
+               netconfig_wifi_bgscan_set_interval(SCAN_EXPONENTIAL_MIN);
                netconfig_wifi_bgscan_start(TRUE);
        } else if ((old_state > NETCONFIG_WIFI_IDLE && old_state < NETCONFIG_WIFI_CONNECTED) && new_state == NETCONFIG_WIFI_IDLE) {
                /* in ipv6 case disconnect/association -> association */
                DBG("reset the bg scan period");
-               netconfig_wifi_set_bgscan_pause(FALSE);
 
                netconfig_wifi_bgscan_stop();
                netconfig_wifi_bgscan_start(TRUE);