[NETFILTER]: Use setup_timer

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 10 insertions, 26 deletions

diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index 259f5c370f3c..8b84cd40279e 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -297,9 +297,7 @@ static int __init ebt_ulog_init(void)
 
         /* initialize ulog_buffers */
         for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) {
-                init_timer(&ulog_buffers[i].timer);
-                ulog_buffers[i].timer.function = ulog_timer;
-                ulog_buffers[i].timer.data = i;
+                setup_timer(&ulog_buffers[i].timer, ulog_timer, i);
                 spin_lock_init(&ulog_buffers[i].lock);
         }
 
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index 57f51af35727..d26bbd2daaa9 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -376,11 +376,8 @@ static int __init ipt_ulog_init(void)
         }
 
         /* initialize ulog_buffers */
-        for (i = 0; i < ULOG_MAXNLGROUPS; i++) {
-                init_timer(&ulog_buffers[i].timer);
-                ulog_buffers[i].timer.function = ulog_timer;
-                ulog_buffers[i].timer.data = i;
-        }
+        for (i = 0; i < ULOG_MAXNLGROUPS; i++)
+                setup_timer(&ulog_buffers[i].timer, ulog_timer, i);
 
         nflognl = netlink_kernel_create(NETLINK_NFLOG, ULOG_MAXNLGROUPS, NULL,
                                         THIS_MODULE);
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 721f02d7b7f6..347ab7608231 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -353,9 +353,7 @@ nf_ct_frag6_create(unsigned int hash, __be32 id, struct in6_addr *src,				   str
         ipv6_addr_copy(&fq->saddr, src);
         ipv6_addr_copy(&fq->daddr, dst);
 
-        init_timer(&fq->timer);
-        fq->timer.function = nf_ct_frag6_expire;
-        fq->timer.data = (long) fq;
+        setup_timer(&fq->timer, nf_ct_frag6_expire, (unsigned long)fq);
         spin_lock_init(&fq->lock);
         atomic_set(&fq->refcnt, 1);
 
@@ -870,8 +868,7 @@ int nf_ct_frag6_init(void)
         nf_ct_frag6_hash_rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^
                                    (jiffies ^ (jiffies >> 6)));
 
-        init_timer(&nf_ct_frag6_secret_timer);
-        nf_ct_frag6_secret_timer.function = nf_ct_frag6_secret_rebuild;
+        setup_timer(&nf_ct_frag6_secret_timer, nf_ct_frag6_secret_rebuild, 0);
         nf_ct_frag6_secret_timer.expires = jiffies
                                            + nf_ct_frag6_secret_interval;
         add_timer(&nf_ct_frag6_secret_timer);
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index a74b205b272d..6f2aac1d01af 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -620,9 +620,8 @@ __nf_conntrack_alloc(const struct nf_conntrack_tuple *orig,
         conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple = *orig;
         conntrack->tuplehash[IP_CT_DIR_REPLY].tuple = *repl;
         /* Don't set timer yet: wait for confirmation */
-        init_timer(&conntrack->timeout);
-        conntrack->timeout.data = (unsigned long)conntrack;
-        conntrack->timeout.function = death_by_timeout;
+        setup_timer(&conntrack->timeout, death_by_timeout,
+                    (unsigned long)conntrack);
         read_unlock_bh(&nf_ct_cache_lock);
 
         return conntrack;
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index ce70a6fc6bda..c31af29a4439 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -290,9 +290,7 @@ static void nf_conntrack_expect_insert(struct nf_conntrack_expect *exp)
         master_help->expecting++;
         list_add(&exp->list, &nf_conntrack_expect_list);
 
-        init_timer(&exp->timeout);
-        exp->timeout.data = (unsigned long)exp;
-        exp->timeout.function = expectation_timed_out;
+        setup_timer(&exp->timeout, expectation_timed_out, (unsigned long)exp);
         exp->timeout.expires = jiffies + master_help->helper->timeout * HZ;
         add_timer(&exp->timeout);
 
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 0ae06561ae9a..d2c6aab6bb7a 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -158,10 +158,7 @@ instance_create(u_int16_t group_num, int pid)
         /* needs to be two, since we _put() after creation */
         atomic_set(&inst->use, 2);
 
-        init_timer(&inst->timer);
-        inst->timer.function = nfulnl_timer;
-        inst->timer.data = (unsigned long)inst;
-        /* don't start timer yet. (re)start it  with every packet */
+        setup_timer(&inst->timer, nfulnl_timer, (unsigned long)inst);
 
         inst->peer_pid = pid;
         inst->group_num = group_num;
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index eb932913693b..d3043fa32ebc 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -216,10 +216,8 @@ static int htable_create(struct xt_hashlimit_info *minfo, int family)
         hinfo->pde->proc_fops = &dl_file_ops;
         hinfo->pde->data = hinfo;
 
-        init_timer(&hinfo->timer);
+        setup_timer(&hinfo->timer, htable_gc, (unsigned long )hinfo);
         hinfo->timer.expires = jiffies + msecs_to_jiffies(hinfo->cfg.gc_interval);
-        hinfo->timer.data = (unsigned long )hinfo;
-        hinfo->timer.function = htable_gc;
         add_timer(&hinfo->timer);
 
         spin_lock_bh(&hashlimit_lock);