2 files changed, 4 insertions, 11 deletions

diff --git a/net/core/flow.c b/net/core/flow.c
index 6489f4e24ecf..46b38e06e0d7 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -352,8 +352,7 @@ static int __init flow_cache_init(void)
         flow_lwm = 2 * flow_hash_size;
         flow_hwm = 4 * flow_hash_size;
 
-        init_timer(&flow_hash_rnd_timer);
-        flow_hash_rnd_timer.function = flow_cache_new_hashrnd;
+        setup_timer(&flow_hash_rnd_timer, flow_cache_new_hashrnd, 0);
         flow_hash_rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD;
         add_timer(&flow_hash_rnd_timer);
 
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 29b8ee4e35d6..175bbc0a974e 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -270,9 +270,7 @@ static struct neighbour *neigh_alloc(struct neigh_table *tbl)
         n->nud_state      = NUD_NONE;
         n->output         = neigh_blackhole;
         n->parms          = neigh_parms_clone(&tbl->parms);
-        init_timer(&n->timer);
-        n->timer.function = neigh_timer_handler;
-        n->timer.data     = (unsigned long)n;
+        setup_timer(&n->timer, neigh_timer_handler, (unsigned long)n);
 
         NEIGH_CACHE_STAT_INC(tbl, allocs);
         n->tbl            = tbl;
@@ -1372,15 +1370,11 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
         get_random_bytes(&tbl->hash_rnd, sizeof(tbl->hash_rnd));
 
         rwlock_init(&tbl->lock);
-        init_timer(&tbl->gc_timer);
-        tbl->gc_timer.data     = (unsigned long)tbl;
-        tbl->gc_timer.function = neigh_periodic_timer;
+        setup_timer(&tbl->gc_timer, neigh_periodic_timer, (unsigned long)tbl);
         tbl->gc_timer.expires  = now + 1;
         add_timer(&tbl->gc_timer);
 
-        init_timer(&tbl->proxy_timer);
-        tbl->proxy_timer.data     = (unsigned long)tbl;
-        tbl->proxy_timer.function = neigh_proxy_process;
+        setup_timer(&tbl->proxy_timer, neigh_proxy_process, (unsigned long)tbl);
         skb_queue_head_init_class(&tbl->proxy_queue,
                         &neigh_table_proxy_queue_class);