netfilter: nf_conntrack: fix lifetime display for disabled connections
authorPatrick McHardy <kaber@trash.net>
Wed, 19 Jan 2011 18:10:49 +0000 (19:10 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 19 Jan 2011 18:10:49 +0000 (19:10 +0100)
commitf5c88f56b35599ab9ff2d3398e0153e4cd4a4c82
treefd2cb178044db9a256638b2e6565795b91cb3c26
parenta992ca2a0498edd22a88ac8c41570f536de29c9e
netfilter: nf_conntrack: fix lifetime display for disabled connections

When no tstamp extension exists, ct_delta_time() returns -1, which is
then assigned to an u64 and tested for negative values to decide
whether to display the lifetime. This obviously doesn't work, use
a s64 and merge the two minor functions into one.

Signed-off-by: Patrick McHardy <kaber@trash.net>
net/netfilter/nf_conntrack_standalone.c