From: Patrick McHardy Date: Wed, 19 Jan 2011 18:10:49 +0000 (+0100) Subject: netfilter: nf_conntrack: fix lifetime display for disabled connections X-Git-Tag: v2.6.39-rc1~468^2~512^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82;p=pandora-kernel.git 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 --- Reading git-diff-tree failed