From bf30ad961c23b1636988d90df4b2283ed7ac819b Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Sun, 13 Jan 2008 22:32:49 -0800
Subject: [PATCH] --- yaml --- r: 75500 b: refs/heads/master c:
 1b310fca30ac9851f79337ca72b1cf6a0f58064a h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/net/802/tr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 33fb0ff26ec0..51741dfaf4a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2948d2ebbb98747b912ac6d0c864b4d02be8a6f5
+refs/heads/master: 1b310fca30ac9851f79337ca72b1cf6a0f58064a
diff --git a/trunk/net/802/tr.c b/trunk/net/802/tr.c
index a2bd0f2e3af8..1e115e5beab6 100644
--- a/trunk/net/802/tr.c
+++ b/trunk/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);