diff options
author | Patrick McHardy <kaber@trash.net> | 2007-03-23 18:16:30 (GMT) |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 05:27:43 (GMT) |
commit | e6f689db51a789807edede411b32eb7c9e457948 (patch) | |
tree | 6ba28587853721dc617d7f71ab622ac54eb4cd9d /net/netfilter/nf_conntrack_expect.c | |
parent | 9afdb00c80b0b9c20435ce690b5287fa2434ef44 (diff) | |
download | linux-fsl-qoriq-e6f689db51a789807edede411b32eb7c9e457948.tar.xz |
[NETFILTER]: Use setup_timer
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_expect.c')
-rw-r--r-- | net/netfilter/nf_conntrack_expect.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index ce70a6f..c31af29 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); |