[PATCH] C99 initializers for net/ipv4/netfilter files

diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index 29c9467457d605fca939e181b64125a511c91fa2..89ff2e83e25b6680265bb4901aa66151aa22de74 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -1361,19 +1361,37 @@ static struct nf_sockopt_ops so_getorigdst
 static struct ctl_table_header *ip_conntrack_sysctl_header;
 
 static ctl_table ip_conntrack_table[] = {
-       { NET_IP_CONNTRACK_MAX, NET_IP_CONNTRACK_MAX_NAME, &ip_conntrack_max,
-         sizeof(ip_conntrack_max), 0644,  NULL, proc_dointvec },
-       { 0 }
+       {
+               .ctl_name       = NET_IP_CONNTRACK_MAX,
+               .procname       = NET_IP_CONNTRACK_MAX_NAME,
+               .data           = &ip_conntrack_max,
+               .maxlen         = sizeof(ip_conntrack_max),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec
+       },
+       { .ctl_name = 0 }
 };
 
 static ctl_table ip_conntrack_dir_table[] = {
-       {NET_IPV4, "ipv4", NULL, 0, 0555, ip_conntrack_table, 0, 0, 0, 0, 0},
-       { 0 }
+       {
+               .ctl_name       = NET_IPV4,
+               .procname       = "ipv4",
+               .maxlen         = 0,
+               .mode           = 0555,
+               .child          = ip_conntrack_table
+       },
+       { .ctl_name = 0 }
 };
 
 static ctl_table ip_conntrack_root_table[] = {
-       {CTL_NET, "net", NULL, 0, 0555, ip_conntrack_dir_table, 0, 0, 0, 0, 0},
-       { 0 }
+       {
+               .ctl_name       = CTL_NET,
+               .procname       = "net",
+               .maxlen         = 0,
+               .mode           = 0555,
+               .child          = ip_conntrack_dir_table
+       },
+       { .ctl_name = 0 }
 };
 #endif /*CONFIG_SYSCTL*/
 

diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index d832d2d98d3b15ebda2ecca7c8c66a9c1451929e..fa43bb82bcea2ab1636748c4fb806a8f083e9e30 100644 (file)
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -586,19 +586,37 @@ static int sysctl_maxlen = IPQ_QMAX_DEFAULT;
 static struct ctl_table_header *ipq_sysctl_header;
 
 static ctl_table ipq_table[] = {
-       { NET_IPQ_QMAX, NET_IPQ_QMAX_NAME, &sysctl_maxlen,
-         sizeof(sysctl_maxlen), 0644,  NULL, proc_dointvec },
-       { 0 }
+       {
+               .ctl_name       = NET_IPQ_QMAX,
+               .procname       = NET_IPQ_QMAX_NAME,
+               .data           = &sysctl_maxlen,
+               .maxlen         = sizeof(sysctl_maxlen),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec
+       },
+       { .ctl_name = 0 }
 };
 
 static ctl_table ipq_dir_table[] = {
-       {NET_IPV4, "ipv4", NULL, 0, 0555, ipq_table, 0, 0, 0, 0, 0},
-       { 0 }
+       {
+               .ctl_name       = NET_IPV4,
+               .procname       = "ipv4",
+               .maxlen         = 0,
+               .mode           = 0555,
+               .child          = ipq_table
+       },
+       { .ctl_name = 0 }
 };
 
 static ctl_table ipq_root_table[] = {
-       {CTL_NET, "net", NULL, 0, 0555, ipq_dir_table, 0, 0, 0, 0, 0},
-       { 0 }
+       {
+               .ctl_name       = CTL_NET,
+               .procname       = "net",
+               .maxlen         = 0,
+               .mode           = 0555,
+               .child          = ipq_dir_table
+       },
+       { .ctl_name = 0 }
 };
 
 static int