---

yaml --- r: 75500 b: refs/heads/master c: 1b310fc h: refs/heads/master v: v3
git-mirror · Jan 14, 2008 · bf30ad9 · bf30ad9
1 parent eef579a
commit bf30ad9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);