[NETFILTER]: Use setup_timer

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

1 files changed, 2 insertions, 3 deletions

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index a74b205b272..6f2aac1d01a 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;