summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-12-18 23:04:50 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2018-12-21 00:51:56 +0100
commit8527f9df04a8b5f6ee24ae7bdda5a94d73c7d243 (patch)
treee3dbe179621bdc4fe0a37b7f43fe96ed59d59134 /include
parentnetfilter: conntrack: remove empty pernet fini stubs (diff)
downloadlinux-8527f9df04a8b5f6ee24ae7bdda5a94d73c7d243.tar.xz
linux-8527f9df04a8b5f6ee24ae7bdda5a94d73c7d243.zip
netfilter: netns: shrink netns_ct struct
remove the obsolete sysctl anchors and move auto_assign_helper_warned to avoid/cover a hole. Reduces size by 40 bytes on 64 bit. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/netns/conntrack.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index 9795d628a127..51cba0b8adf5 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -97,18 +97,14 @@ struct netns_ct {
struct delayed_work ecache_dwork;
bool ecache_dwork_pending;
#endif
+ bool auto_assign_helper_warned;
#ifdef CONFIG_SYSCTL
struct ctl_table_header *sysctl_header;
- struct ctl_table_header *acct_sysctl_header;
- struct ctl_table_header *tstamp_sysctl_header;
- struct ctl_table_header *event_sysctl_header;
- struct ctl_table_header *helper_sysctl_header;
#endif
unsigned int sysctl_log_invalid; /* Log invalid packets */
int sysctl_events;
int sysctl_acct;
int sysctl_auto_assign_helper;
- bool auto_assign_helper_warned;
int sysctl_tstamp;
int sysctl_checksum;