]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[TOKENRING]: rif_timer not initialized properly
authorEric Dumazet <dada1@cosmosbay.com>
Mon, 14 Jan 2008 06:32:49 +0000 (22:32 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Jan 2008 06:32:49 +0000 (22:32 -0800)
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/802/tr.c

index a2bd0f2e3af84c85e5e0077963b2bd3616b69d93..1e115e5beab635aeb67baede5c4aa36881545efe 100644 (file)
@@ -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);