[PKT_SCHED]: Remove dead timer code.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@redhat.com>

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 825e11014edb9c3dc61cdd21a6d51d4111e99814..e3f5fd13dbcd73e7b4b0a56a8364353eb5043c67 100644 (file)
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -216,8 +216,6 @@ typedef long                psched_tdiff_t;
 typedef u64    psched_time_t;
 typedef long   psched_tdiff_t;
 
-extern psched_time_t   psched_time_base;
-
 #if PSCHED_CLOCK_SOURCE == PSCHED_JIFFIES
 
 #if HZ < 96
@@ -256,6 +254,7 @@ extern int psched_clock_scale;
 
 #define PSCHED_WATCHER u32
 
+extern psched_time_t psched_time_base;
 extern PSCHED_WATCHER psched_time_mark;
 
 #define PSCHED_GET_TIME(stamp) \

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 575ca5016a4a4e3727f31da77b8caecd3e20f5a4..c876d586b5ad420521a91fcccbcf914550fd8419 100644 (file)
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1103,16 +1103,14 @@ int psched_tod_diff(int delta_sec, int bound)
 EXPORT_SYMBOL(psched_tod_diff);
 #endif
 
-psched_time_t psched_time_base;
-
 #if PSCHED_CLOCK_SOURCE == PSCHED_CPU
 psched_tdiff_t psched_clock_per_hz;
 int psched_clock_scale;
 EXPORT_SYMBOL(psched_clock_per_hz);
 EXPORT_SYMBOL(psched_clock_scale);
-#endif
 
 #ifdef PSCHED_WATCHER
+psched_time_t psched_time_base;
 PSCHED_WATCHER psched_time_mark;
 EXPORT_SYMBOL(psched_time_mark);
 EXPORT_SYMBOL(psched_time_base);
@@ -1123,22 +1121,14 @@ static struct timer_list psched_timer = TIMER_INITIALIZER(psched_tick, 0, 0);
 
 static void psched_tick(unsigned long dummy)
 {
-#if PSCHED_CLOCK_SOURCE == PSCHED_CPU
        psched_time_t dummy_stamp;
        PSCHED_GET_TIME(dummy_stamp);
        /* It is OK up to 4GHz cpu */
        psched_timer.expires = jiffies + 1*HZ;
-#else
-       unsigned long now = jiffies;
-       psched_time_base += ((u64)(now-psched_time_mark))<<PSCHED_JSCALE;
-       psched_time_mark = now;
-       psched_timer.expires = now + 60*60*HZ;
-#endif
        add_timer(&psched_timer);
 }
 #endif
 
-#if PSCHED_CLOCK_SOURCE == PSCHED_CPU
 int __init psched_calibrate_clock(void)
 {
        psched_time_t stamp, stamp1;
@@ -1185,9 +1175,6 @@ static int __init pktsched_init(void)
 #elif PSCHED_CLOCK_SOURCE == PSCHED_JIFFIES
        psched_tick_per_us = HZ<<PSCHED_JSCALE;
        psched_us_per_tick = 1000000;
-#ifdef PSCHED_WATCHER
-       psched_tick(0);
-#endif
 #endif
 
        link_p = rtnetlink_links[PF_UNSPEC];