Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

-2
-2
include/net/netfilter/nf_conntrack_l4proto.h
··· 77 77 struct nf_conntrack_tuple *t); 78 78 const struct nla_policy *nla_policy; 79 79 80 - #if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) 81 80 struct { 82 81 int (*nlattr_to_obj)(struct nlattr *tb[], 83 82 struct net *net, void *data); ··· 86 87 u16 nlattr_max; 87 88 const struct nla_policy *nla_policy; 88 89 } ctnl_timeout; 89 - #endif 90 90 #ifdef CONFIG_NF_CONNTRACK_PROCFS 91 91 /* Print out the private part of the conntrack. */ 92 92 void (*print_conntrack)(struct seq_file *s, struct nf_conn *);