Re: [PATCH nf-next v2 2/2] netfilter: cttimeout: move ctnl_untimeout to nf_conntrack

[Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>]

On Thu, Jul 19, 2018 at 02:12:27AM +0200, Harsha Sharma wrote:
> diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h
> index 80ceb3d0291d..edb3b5271ef5 100644
> --- a/include/net/netfilter/nf_conntrack_timeout.h
> +++ b/include/net/netfilter/nf_conntrack_timeout.h
> @@ -98,6 +98,7 @@ static inline void nf_conntrack_timeout_fini(void)
>  #ifdef CONFIG_NF_CONNTRACK_TIMEOUT
>  extern struct ctnl_timeout *(*nf_ct_timeout_find_get_hook)(struct net *net, const char *name);
>  extern void (*nf_ct_timeout_put_hook)(struct ctnl_timeout *timeout);
> +extern void nf_ct_untimeout(struct net *net, struct ctnl_timeout *timeout);

Please, do this instead:

diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h
index 9468ab4ad12d..05eb39c0d37a 100644
--- a/include/net/netfilter/nf_conntrack_timeout.h
+++ b/include/net/netfilter/nf_conntrack_timeout.h
@@ -93,6 +93,7 @@ nf_ct_timeout_lookup(struct net *net, struct nf_conn *ct,
 #ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 int nf_conntrack_timeout_init(void);
 void nf_conntrack_timeout_fini(void);
+void nf_ct_untimeout(struct net *net, struct ctnl_timeout *timeout);
 #else
 static inline int nf_conntrack_timeout_init(void)
 {
@@ -103,6 +104,9 @@ static inline void nf_conntrack_timeout_fini(void)
 {
         return;
 }
+static inline void nf_ct_untimeout(struct net *net, struct ctnl_timeout *timeout)
+{
+}
 #endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
 
 #ifdef CONFIG_NF_CONNTRACK_TIMEOUT

So we can simplify your timeout support for nft_ct.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html