Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / include / net / netns / conntrack.h

diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index 29d6a94db54d6136b6b380d5817341d2bbe83bce..235d3d841cc7966cd33083f69f640f958c2aaf60 100644 (file)
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
 struct nf_proto_net {
 #ifdef CONFIG_SYSCTL
        struct ctl_table_header *ctl_table_header;
-       struct ctl_table        *ctl_table;
+       ctl_table_no_const      *ctl_table;
 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
        struct ctl_table_header *ctl_compat_header;
-       struct ctl_table        *ctl_compat_table;
+       ctl_table_no_const      *ctl_compat_table;
 #endif
 #endif
        unsigned int            users;
@@ -60,7 +60,7 @@ struct nf_ip_net {
        struct nf_icmp_net      icmpv6;
 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
        struct ctl_table_header *ctl_table_header;
-       struct ctl_table        *ctl_table;
+       ctl_table_no_const      *ctl_table;
 #endif
 };