From 4e8243e660e10cafd8351bc834ac1baefa4dfc69 Mon Sep 17 00:00:00 2001 From: hyunuktak Date: Mon, 29 Aug 2016 13:46:43 +0900 Subject: [PATCH] Add script file for OS upgrade remove power save feature Change-Id: I90a7ee246aa3eb0f6012a9d98585c827441ee2fc Signed-off-by: hyunuktak --- packaging/net-config.spec | 11 +++++++++-- scripts/netconfig_upgrade.sh | 13 +++++++++++++ src/wifi-firmware.c | 16 ---------------- 3 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 scripts/netconfig_upgrade.sh diff --git a/packaging/net-config.spec b/packaging/net-config.spec index 6003dcf..0aba72d 100755 --- a/packaging/net-config.spec +++ b/packaging/net-config.spec @@ -1,6 +1,6 @@ Name: net-config Summary: TIZEN Network Configuration service -Version: 1.1.84 +Version: 1.1.85 Release: 2 Group: System/Network License: Apache-2.0 @@ -28,6 +28,8 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +%define upgrade_script_path /usr/share/upgrade/scripts + %description TIZEN Network Configuration service @@ -114,6 +116,10 @@ cp resources/usr/system/RestoreDir/softreset/network_softreset.sh %{buildroot}/u mkdir -p %{buildroot}%{_datadir}/license cp LICENSE %{buildroot}%{_datadir}/license/net-config +#OS Upgrade +mkdir -p %{buildroot}%{upgrade_script_path} +cp -f scripts/netconfig_upgrade.sh %{buildroot}%{upgrade_script_path} + %post chsmack -a 'System::Shared' %{_sysconfdir}/resolv.conf @@ -158,5 +164,6 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen %endif %if 0%{?model_build_feature_wlan_wearable} == 1 %attr(700,root,root) /usr/system/RestoreDir/softreset/network_softreset.sh - %endif +%{upgrade_script_path}/netconfig_upgrade.sh + diff --git a/scripts/netconfig_upgrade.sh b/scripts/netconfig_upgrade.sh new file mode 100644 index 0000000..d855424 --- /dev/null +++ b/scripts/netconfig_upgrade.sh @@ -0,0 +1,13 @@ +#!/bin/sh +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +#-----------------------------------------------# +# netconfig patch for upgrade (2.4 -> 3.0) # +#-----------------------------------------------# + +rm -f /opt/dbspace/.wifi_offload.db +rm -f /opt/dbspace/.wifi_offload.db-journal +rm -f /opt/etc/dump.d/module.d/network_log_dump.sh +rm -f /opt/var/lib/net-config/network_dump.sh +rm -f /opt/var/lib/net-config/network_log_dump.sh + diff --git a/src/wifi-firmware.c b/src/wifi-firmware.c index e416baa..797e3c4 100755 --- a/src/wifi-firmware.c +++ b/src/wifi-firmware.c @@ -29,9 +29,6 @@ #include "netsupplicant.h" #include "wifi-firmware.h" #include "network-statistics.h" -#if defined WLAN_CHECK_POWERSAVE -#include "wifi-powersave.h" -#endif #define WLAN_DRIVER_SCRIPT "/usr/bin/wlan.sh" #define WLAN_IFACE_NAME "wlan0" @@ -234,12 +231,6 @@ int netconfig_wifi_firmware(enum netconfig_wifi_firmware type, gboolean enable) if (current_driver == NETCONFIG_WIFI_OFF) { return -EALREADY; } else if (current_driver == alias) { -#if defined WLAN_CHECK_POWERSAVE - if (type == NETCONFIG_WIFI_STA && netconfig_wifi_is_powersave_mode() == TRUE) { - netconfig_interface_down(WIFI_IFNAME); - return -EALREADY; - } -#endif #if defined WLAN_CONCURRENT_MODE netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &flight_mode); @@ -270,13 +261,6 @@ int netconfig_wifi_firmware(enum netconfig_wifi_firmware type, gboolean enable) if (current_driver > NETCONFIG_WIFI_OFF) { if (current_driver == alias) { -#if defined WLAN_CHECK_POWERSAVE - if (type == NETCONFIG_WIFI_STA && netconfig_wifi_is_powersave_mode() == TRUE) { - netconfig_interface_up(WIFI_IFNAME); - - return -EALREADY; - } -#endif #if defined WLAN_CONCURRENT_MODE if (type == NETCONFIG_WIFI_STA) -- 2.7.4