Merge branch 'master'

[linux.git] / net / core / dst.c

diff --git a/net/core/dst.c b/net/core/dst.c
index 334790da9f160cd6852a35e5186db16cbb3d14b1..470c05bc4cb2bd513f1ba37002a81f46266c8905 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -39,8 +39,7 @@ static unsigned long dst_gc_timer_inc = DST_GC_MAX;
 static void dst_run_gc(unsigned long);
 static void ___dst_free(struct dst_entry * dst);
 
-static struct timer_list dst_gc_timer =
-       TIMER_INITIALIZER(dst_run_gc, DST_GC_MIN, 0);
+static DEFINE_TIMER(dst_gc_timer, dst_run_gc, DST_GC_MIN, 0);
 
 static void dst_run_gc(unsigned long dummy)
 {