From ec35d1e36ad94de06d5eabb5f5de00b936e50894 Mon Sep 17 00:00:00 2001 From: Danny Jeongseok Seo Date: Thu, 19 Jul 2012 13:34:40 +0900 Subject: [PATCH] Fix Wi-Fi BG scan bug for default value --- debian/changelog | 8 ++++++++ packaging/net-config.spec | 2 +- src/wifi-background-scan.c | 16 +++++++--------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index f248412..49003c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +net-config (0.1.85-1) unstable; urgency=low + + * Fix Wi-Fi BG Scan bug for default value + * Git: slp/pkgs/n/net-config + * Tag: net-config_0.1.85-1 + + -- Sanghoon Cho Fri, 01 Jun 2012 15:12:49 +0900 + net-config (0.1.84-1) unstable; urgency=low * Fix Wi-Fi power state update diff --git a/packaging/net-config.spec b/packaging/net-config.spec index 8ce69bc..1aa211a 100644 --- a/packaging/net-config.spec +++ b/packaging/net-config.spec @@ -2,7 +2,7 @@ Name: net-config Summary: TIZEN Network Configuration Module -Version: 0.1.84_1 +Version: 0.1.85_1 Release: 1 Group: System/Network License: Apache License Version 2.0 diff --git a/src/wifi-background-scan.c b/src/wifi-background-scan.c index d46e2e0..2fd5e55 100644 --- a/src/wifi-background-scan.c +++ b/src/wifi-background-scan.c @@ -30,15 +30,13 @@ #include "wifi-state.h" #include "wifi-background-scan.h" -#define SCAN_INITIAL_DELAY 10 #define SCAN_PERIODIC_DELAY 10 #define SCAN_EXPONENTIAL_MIN 4 #define SCAN_EXPONENTIAL_MAX 128 enum { - WIFI_BGSCAN_MODE_DEFAULT = 0x00, + WIFI_BGSCAN_MODE_EXPONENTIAL = 0x00, WIFI_BGSCAN_MODE_PERIODIC, - WIFI_BGSCAN_MODE_EXPONENTIAL, WIFI_BGSCAN_MODE_MAX, }; @@ -50,19 +48,19 @@ struct bgscan_timer_data { static struct bgscan_timer_data *__netconfig_wifi_bgscan_get_bgscan_data(void) { - static struct bgscan_timer_data timer_data = {SCAN_INITIAL_DELAY, WIFI_BGSCAN_MODE_EXPONENTIAL, 0}; + static struct bgscan_timer_data timer_data = {SCAN_EXPONENTIAL_MIN, WIFI_BGSCAN_MODE_EXPONENTIAL, 0}; return &timer_data; } static guint __netconfig_wifi_bgscan_mode(gboolean is_set_mode, guint mode) { - static guint bgscan_mode = WIFI_BGSCAN_MODE_DEFAULT; + static guint bgscan_mode = WIFI_BGSCAN_MODE_EXPONENTIAL; if (is_set_mode != TRUE) return bgscan_mode; - if (mode < WIFI_BGSCAN_MODE_MAX && mode > WIFI_BGSCAN_MODE_DEFAULT) + if (mode < WIFI_BGSCAN_MODE_MAX && mode >= WIFI_BGSCAN_MODE_EXPONENTIAL) bgscan_mode = mode; DBG("Wi-Fi background scan mode set %d", bgscan_mode); @@ -149,8 +147,8 @@ static void __netconfig_wifi_bgscan_start_timer(struct bgscan_timer_data *data) break; default: - data->time = SCAN_INITIAL_DELAY; - DBG("Wi-Fi background scan with initial delay"); + DBG("Error! Wi-Fi background scan mode [%d]", data->mode); + return; } DBG("Register background scan timer with %d seconds", data->time); @@ -220,7 +218,7 @@ gboolean netconfig_iface_wifi_set_bgscan(NetconfigWifi *wifi, guint scan_mode, G DBG("Wi-Fi background scan mode set: %d", scan_mode); - if (scan_mode >= WIFI_BGSCAN_MODE_MAX || scan_mode == WIFI_BGSCAN_MODE_DEFAULT) + if (scan_mode >= WIFI_BGSCAN_MODE_MAX || scan_mode < WIFI_BGSCAN_MODE_EXPONENTIAL) return FALSE; switch (scan_mode) { -- 2.7.4