Commit 613a0c67 authored by Jiapeng Chong's avatar Jiapeng Chong Committed by Pablo Neira Ayuso

netfilter: conntrack: Use max() instead of doing it manually

Fix following coccicheck warning:

./include/net/netfilter/nf_conntrack.h:282:16-17: WARNING opportunity
for max().
Reported-by: default avatarAbaci Robot <abaci@linux.alibaba.com>
Signed-off-by: default avatarJiapeng Chong <jiapeng.chong@linux.alibaba.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 2b71e2c7
...@@ -279,7 +279,7 @@ static inline unsigned long nf_ct_expires(const struct nf_conn *ct) ...@@ -279,7 +279,7 @@ static inline unsigned long nf_ct_expires(const struct nf_conn *ct)
{ {
s32 timeout = READ_ONCE(ct->timeout) - nfct_time_stamp; s32 timeout = READ_ONCE(ct->timeout) - nfct_time_stamp;
return timeout > 0 ? timeout : 0; return max(timeout, 0);
} }
static inline bool nf_ct_is_expired(const struct nf_conn *ct) static inline bool nf_ct_is_expired(const struct nf_conn *ct)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment