netfilter: remove ifdef around cttimeout in struct nf_conntrack_l4proto

Simplify this, include it inconditionally in this structure layout as we
do with ctnetlink.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 6068c6da3eaca03703f3fe08f36b8649ae4e0cc4..8465263b297d70921678fa4c9bf3281c18aaa4ff 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -77,7 +77,6 @@ struct nf_conntrack_l4proto {
                               struct nf_conntrack_tuple *t);
        const struct nla_policy *nla_policy;
 
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
        struct {
                int (*nlattr_to_obj)(struct nlattr *tb[],
                                     struct net *net, void *data);
@@ -87,7 +86,6 @@ struct nf_conntrack_l4proto {
                u16 nlattr_max;
                const struct nla_policy *nla_policy;
        } ctnl_timeout;
-#endif
 #ifdef CONFIG_NF_CONNTRACK_PROCFS
        /* Print out the private part of the conntrack. */
        void (*print_conntrack)(struct seq_file *s, struct nf_conn *);