diff options
| author | Florian Westphal <fw@strlen.de> | 2016-08-03 02:45:07 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-08-12 00:43:13 +0200 |
| commit | d0b35b93d45cedf1dc561aba4027441b3d28d290 (patch) | |
| tree | 6c5917ba3944ed563a86517e5503a371e23757a1 /net/ipv4/netfilter | |
| parent | 9f7c824a44c9f03a5ee9b6291b0685cbdb89ae58 (diff) | |
| download | linux-d0b35b93d45cedf1dc561aba4027441b3d28d290.tar.gz linux-d0b35b93d45cedf1dc561aba4027441b3d28d290.tar.xz | |
netfilter: use_nf_conn_expires helper in more places
... so we don't need to touch all of these places when we get rid of the
timer in nf_conn.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv4/netfilter')
| -rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c index 63923710f325..67bfc69e00bc 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c @@ -163,8 +163,7 @@ static int ct_seq_show(struct seq_file *s, void *v) ret = -ENOSPC; seq_printf(s, "%-8s %u %ld ", l4proto->name, nf_ct_protonum(ct), - timer_pending(&ct->timeout) - ? (long)(ct->timeout.expires - jiffies)/HZ : 0); + nf_ct_expires(ct) / HZ); if (l4proto->print_conntrack) l4proto->print_conntrack(s, ct); |