From 54c23a313ea4c8e65d84ac55087af380c1a05e46 Mon Sep 17 00:00:00 2001 From: hartkopp Date: Fri, 16 Nov 2007 08:24:23 +0000 Subject: [PATCH] Moved init_timer() and add_timer() for timer setup to setup_timer() and mod_timer() to prevent comments from Stephen Hemminger on netdev ML ... git-svn-id: svn://svn.berlios.de//socketcan/trunk@551 030b6a49-0b11-0410-94ab-b0dab22257f2 --- kernel/2.6/net/can/af_can.c | 14 ++++---------- kernel/2.6/net/can/proc.c | 5 ++--- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c index 5e83afe..5db7768 100644 --- a/kernel/2.6/net/can/af_can.c +++ b/kernel/2.6/net/can/af_can.c @@ -913,19 +913,13 @@ static __init int can_init(void) if (stats_timer) { /* the statistics are updated every second (timer triggered) */ - init_timer(&stattimer); - stattimer.function = can_stat_update; - stattimer.data = 0; - /* update every second */ + setup_timer(&stattimer, can_stat_update, 0); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) - stattimer.expires = round_jiffies(jiffies + HZ); + mod_timer(&stattimer, round_jiffies(jiffies + HZ)); #else - stattimer.expires = jiffies + HZ; + mod_timer(&stattimer, jiffies + HZ); #endif - /* start statistics timer */ - add_timer(&stattimer); - } else - stattimer.function = NULL; + } can_init_proc(); diff --git a/kernel/2.6/net/can/proc.c b/kernel/2.6/net/can/proc.c index 90095f1..c8f8f68 100644 --- a/kernel/2.6/net/can/proc.c +++ b/kernel/2.6/net/can/proc.c @@ -188,11 +188,10 @@ void can_stat_update(unsigned long data) /* restart timer (one second) */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) - stattimer.expires = round_jiffies(jiffies + HZ); + mod_timer(&stattimer, round_jiffies(jiffies + HZ)); #else - stattimer.expires = jiffies + HZ; + mod_timer(&stattimer, jiffies + HZ); #endif - add_timer(&stattimer); } /* -- 2.39.2