Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1b310f...
Commit: 1b310fca30ac9851f79337ca72b1cf6a0f58064a
Parent: 2948d2ebbb98747b912ac6d0c864b4d02be8a6f5
Author: Eric Dumazet <dada1@cosmosbay.com>
AuthorDate: Sun Jan 13 22:32:49 2008 -0800
Committer: David S. Miller <davem@davemloft.net>
CommitDate: Sun Jan 13 22:32:49 2008 -0800
[TOKENRING]: rif_timer not initialized properly
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/802/tr.c | 2 +-
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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
