Re: [PATCH nf-next] netfilter: conntrack: avoid same-timeout update

[Phil Sutter <phil@nwl.cc>]

On Thu, Feb 21, 2019 at 03:38:29PM +0100, Florian Westphal wrote:
> No need to dirty a cache line if timeout is unchanged.
> Also, WARN() is useless here: we crash on 'skb->len' access
> if skb is NULL.
> 
> Last, ct->timeout is u32, not 'unsigned long' so adapt the
> function prototype accordingly.
> 
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
>  include/net/netfilter/nf_conntrack.h | 10 +++++-----
>  net/netfilter/nf_conntrack_core.c    |  9 ++++-----
>  2 files changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
> index b5aac5ae5129..2270ee5202e3 100644
> --- a/include/net/netfilter/nf_conntrack.h
> +++ b/include/net/netfilter/nf_conntrack.h
> @@ -190,23 +190,23 @@ bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff,
>  
>  void __nf_ct_refresh_acct(struct nf_conn *ct, enum ip_conntrack_info ctinfo,
>  			  const struct sk_buff *skb,
> -			  unsigned long extra_jiffies, int do_acct);
> +			  u32, bool do_acct);

Maybe not worth a respin, but this mix of named and unnamed parameters
in function prototype is probably not intentional.

Cheers, Phil