aboutsummaryrefslogtreecommitdiffstats
path: root/net/802/tr.c
diff options
context:
space:
mode:
authorEric Dumazet <dada1@cosmosbay.com>2008-01-13 22:32:49 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-13 22:32:49 -0800
commit1b310fca30ac9851f79337ca72b1cf6a0f58064a (patch)
tree0ada9fbebbca87c5ddb0c836fedce288f1acea2f /net/802/tr.c
parent2948d2ebbb98747b912ac6d0c864b4d02be8a6f5 (diff)
downloadkernel_samsung_aries-1b310fca30ac9851f79337ca72b1cf6a0f58064a.zip
kernel_samsung_aries-1b310fca30ac9851f79337ca72b1cf6a0f58064a.tar.gz
kernel_samsung_aries-1b310fca30ac9851f79337ca72b1cf6a0f58064a.tar.bz2
[TOKENRING]: rif_timer not initialized properly
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/802/tr.c')
-rw-r--r--net/802/tr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/802/tr.c b/net/802/tr.c
index a2bd0f2..1e115e5 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);