git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
net
/
core
/
dst.c
diff --git
a/net/core/dst.c
b/net/core/dst.c
index
470c05b
..
1a5e49d
100644
(file)
--- a/
net/core/dst.c
+++ b/
net/core/dst.c
@@
-95,12
+95,11
@@
static void dst_run_gc(unsigned long dummy)
dst_gc_timer_inc = DST_GC_INC;
dst_gc_timer_expires = DST_GC_MIN;
}
dst_gc_timer_inc = DST_GC_INC;
dst_gc_timer_expires = DST_GC_MIN;
}
- dst_gc_timer.expires = jiffies + dst_gc_timer_expires;
#if RT_CACHE_DEBUG >= 2
printk("dst_total: %d/%d %ld\n",
atomic_read(&dst_total), delayed, dst_gc_timer_expires);
#endif
#if RT_CACHE_DEBUG >= 2
printk("dst_total: %d/%d %ld\n",
atomic_read(&dst_total), delayed, dst_gc_timer_expires);
#endif
-
add_timer(&dst_gc_timer
);
+
mod_timer(&dst_gc_timer, jiffies + dst_gc_timer_expires
);
out:
spin_unlock(&dst_lock);
out:
spin_unlock(&dst_lock);