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/netfilter/nf_conntrack_netlink.c | |
| parent | netfilter: nf_dup4: remove redundant checksum recalculation (diff) | |
| download | wireguard-linux-d0b35b93d45cedf1dc561aba4027441b3d28d290.tar.xz wireguard-linux-d0b35b93d45cedf1dc561aba4027441b3d28d290.zip | |
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/netfilter/nf_conntrack_netlink.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 050bb3420a6b..68800c10a320 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -149,10 +149,7 @@ nla_put_failure: static int ctnetlink_dump_timeout(struct sk_buff *skb, const struct nf_conn *ct) { - long timeout = ((long)ct->timeout.expires - (long)jiffies) / HZ; - - if (timeout < 0) - timeout = 0; + long timeout = nf_ct_expires(ct) / HZ; if (nla_put_be32(skb, CTA_TIMEOUT, htonl(timeout))) goto nla_put_failure; |