hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Pablo Neira Ayuso 2018-08-07 17:14:19 +02:00
parent 6c1fd7dc48
commit ad83f2a9ce
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/netfilter/nf_conntrack_l4proto.h
View File

@ -77,7 +77,6 @@ struct nf_conntrack_l4proto {
struct nf_conntrack_tuple *t); struct nf_conntrack_tuple *t);
const struct nla_policy *nla_policy; const struct nla_policy *nla_policy;
#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
struct { struct {
int (*nlattr_to_obj)(struct nlattr *tb[], int (*nlattr_to_obj)(struct nlattr *tb[],
struct net *net, void *data); struct net *net, void *data);
@ -87,7 +86,6 @@ struct nf_conntrack_l4proto {
u16 nlattr_max; u16 nlattr_max;
const struct nla_policy *nla_policy; const struct nla_policy *nla_policy;
} ctnl_timeout; } ctnl_timeout;
#endif
#ifdef CONFIG_NF_CONNTRACK_PROCFS #ifdef CONFIG_NF_CONNTRACK_PROCFS
/* Print out the private part of the conntrack. */ /* Print out the private part of the conntrack. */
void (*print_conntrack)(struct seq_file *s, struct nf_conn *); void (*print_conntrack)(struct seq_file *s, struct nf_conn *);