From 08bdd67d15307e02106ead7054f18fd7dd000a76 Mon Sep 17 00:00:00 2001
From: Benjamin Thery <benjamin.thery@bull.net>
Date: Fri, 12 Sep 2008 16:16:37 -0700
Subject: [PATCH] --- yaml --- r: 111658 b: refs/heads/master c:
 f262b59becc3f557da6460232abac13706402849 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dst.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fc85a22395ff..b15012d49ca6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ae4be22f64326a6784acd7083b9590c9f4215a2
+refs/heads/master: f262b59becc3f557da6460232abac13706402849
diff --git a/trunk/net/core/dst.c b/trunk/net/core/dst.c
index fe03266130b6..09c1530f4681 100644
--- a/trunk/net/core/dst.c
+++ b/trunk/net/core/dst.c
@@ -203,6 +203,7 @@ void __dst_free(struct dst_entry * dst)
 	if (dst_garbage.timer_inc > DST_GC_INC) {
 		dst_garbage.timer_inc = DST_GC_INC;
 		dst_garbage.timer_expires = DST_GC_MIN;
+		cancel_delayed_work(&dst_gc_work);
 		schedule_delayed_work(&dst_gc_work, dst_garbage.timer_expires);
 	}
 	spin_unlock_bh(&dst_garbage.lock);