[PORT FROM R2]: porting two patches from R2.

BZ: 23292

1. Decrease TS:cyttsp refresh inteval for lower power consumption.
   Author: Fengwei Yin <fengwei.yin@intel.com>
2. ipvs: use deferrable timers to avoid frequent wake-up.
   Author: Pierre Tardy <pierre.tardy@intel.com>

Change-Id: Ibced86bcc71bc7eb556b5f940b56b0a43c79df70
Signed-off-by: Fei Yang <fei.yang@intel.com>
Reviewed-on: http://android.intel.com:8080/36623
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Cuesta, FernandX <fernandx.cuesta@intel.com>
Tested-by: Ng, Cheon-woei <cheon-woei.ng@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/arch/x86/platform/intel-mid/board-blackbay.c b/arch/x86/platform/intel-mid/board-blackbay.c
index 28bdb28..8fa414e 100644 (file)
--- a/arch/x86/platform/intel-mid/board-blackbay.c
+++ b/arch/x86/platform/intel-mid/board-blackbay.c
@@ -513,8 +513,8 @@ static void *cyttsp_platform_data(void *info)
        static struct cyttsp_platform_data cyttsp_pdata = {
                .init = cyttsp_init,
                .mt_sync = input_mt_sync,
-               .maxx = 479,
-               .maxy = 853,
+               .maxx = 480,
+               .maxy = 864,
                .flags = 0,
                .gen = CY_GEN3,
                .use_st = 0,

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index a178cb3..f4dfe02 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3648,7 +3648,7 @@ int __net_init __ip_vs_control_init_sysctl(struct net *net)
        ip_vs_start_estimator(net, &ipvs->tot_stats);
        ipvs->sysctl_tbl = tbl;
        /* Schedule defense work */
-       INIT_DELAYED_WORK(&ipvs->defense_work, defense_work_handler);
+       INIT_DELAYED_WORK_DEFERRABLE(&ipvs->defense_work, defense_work_handler);
        schedule_delayed_work(&ipvs->defense_work, DEFENSE_TIMER_PERIOD);
 
        return 0;

diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c
index 508cce9..61087bf 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_est.c
+++ b/net/netfilter/ipvs/ip_vs_est.c
@@ -198,7 +198,9 @@ int __net_init __ip_vs_estimator_init(struct net *net)
 
        INIT_LIST_HEAD(&ipvs->est_list);
        spin_lock_init(&ipvs->est_lock);
-       setup_timer(&ipvs->est_timer, estimation_timer, (unsigned long)net);
+       ipvs->est_timer.function = estimation_timer;
+       ipvs->est_timer.data = (unsigned long)net;
+       init_timer_deferrable(&ipvs->est_timer);
        mod_timer(&ipvs->est_timer, jiffies + 2 * HZ);
        return 0;
 }