diff --git a/tr.c b/tr.c index 5d29488..93a13c8 100644 --- a/tr.c +++ b/tr.c @@ -40,7 +40,7 @@ #include static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev); -static void rif_check_expire(unsigned long dummy); +static void rif_check_expire(struct timer_list *t); #define TR_SR_DEBUG 0 @@ -429,7 +429,7 @@ printk("updating rif_entry: addr:%pM rcf:%04X\n", * Scan the cache with a timer and see what we need to throw out. */ -static void rif_check_expire(unsigned long dummy) +static void rif_check_expire(struct timer_list *t) { int i; unsigned long flags, next_interval = jiffies + sysctl_tr_rif_timeout/2; @@ -659,7 +659,7 @@ static __initdata struct ctl_path tr_path[] = { static int __init rif_init(void) { rif_timer.expires = jiffies + sysctl_tr_rif_timeout; - setup_timer(&rif_timer, rif_check_expire, 0); + timer_setup(&rif_timer, rif_check_expire, 0); add_timer(&rif_timer); #ifdef CONFIG_SYSCTL register_sysctl_paths(tr_path, tr_table);