From: Eric Dumazet Date: Mon, 14 Jan 2008 06:32:49 +0000 (-0800) Subject: [TOKENRING]: rif_timer not initialized properly X-Git-Tag: v2.6.24-rc8~7^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1b310fca30ac9851f79337ca72b1cf6a0f58064a;p=linux-2.6-omap-h63xx.git [TOKENRING]: rif_timer not initialized properly Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller --- diff --git a/net/802/tr.c b/net/802/tr.c index a2bd0f2e3af..1e115e5beab 100644 --- a/net/802/tr.c +++ b/net/802/tr.c @@ -642,7 +642,7 @@ struct net_device *alloc_trdev(int sizeof_priv) static int __init rif_init(void) { init_timer(&rif_timer); - rif_timer.expires = sysctl_tr_rif_timeout; + rif_timer.expires = jiffies + sysctl_tr_rif_timeout; rif_timer.data = 0L; rif_timer.function = rif_check_expire; add_timer(&rif_timer);