Manual content merge with Rusty's ISO struct initializers patch.

net/appletalk/sysctl_net_atalk.c

-/* -*- linux-c -*-
+/*
  * sysctl_net_atalk.c: sysctl interface to net AppleTalk subsystem.
  *
  * Begun April 1, 1996, Mike Shaver.
@@ -17,25 +17,59 @@ extern int sysctl_aarp_resolve_time;
 
 #ifdef CONFIG_SYSCTL
 static ctl_table atalk_table[] = {
-	{NET_ATALK_AARP_EXPIRY_TIME, "aarp-expiry-time",
-	 &sysctl_aarp_expiry_time, sizeof(int), 0644, NULL, &proc_dointvec_jiffies},
-	{NET_ATALK_AARP_TICK_TIME, "aarp-tick-time",
-	 &sysctl_aarp_tick_time, sizeof(int), 0644, NULL, &proc_dointvec_jiffies},
-	{NET_ATALK_AARP_RETRANSMIT_LIMIT, "aarp-retransmit-limit",
-	 &sysctl_aarp_retransmit_limit, sizeof(int), 0644, NULL, &proc_dointvec},
-	{NET_ATALK_AARP_RESOLVE_TIME, "aarp-resolve-time",
-	 &sysctl_aarp_resolve_time, sizeof(int), 0644, NULL, &proc_dointvec_jiffies},
-	{0}
+	{
+		.ctl_name	= NET_ATALK_AARP_EXPIRY_TIME,
+		.procname	= "aarp-expiry-time",
+		.data		= &sysctl_aarp_expiry_time,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec_jiffies,
+	},
+	{
+		.ctl_name	= NET_ATALK_AARP_TICK_TIME,
+		.procname	= "aarp-tick-time",
+		.data		= &sysctl_aarp_tick_time,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec_jiffies,
+	},
+	{
+		.ctl_name	= NET_ATALK_AARP_RETRANSMIT_LIMIT,
+		.procname	= "aarp-retransmit-limit",
+		.data		= &sysctl_aarp_retransmit_limit,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
+	},
+	{
+		.ctl_name	= NET_ATALK_AARP_RESOLVE_TIME,
+		.procname	= "aarp-resolve-time",
+		.data		= &sysctl_aarp_resolve_time,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec_jiffies,
+	},
+	{ 0 },
 };
 
 static ctl_table atalk_dir_table[] = {
-	{NET_ATALK, "appletalk", NULL, 0, 0555, atalk_table},
-	{0}
+	{
+		.ctl_name	= NET_ATALK,
+		.procname	= "appletalk",
+		.mode		= 0555,
+		.child		= atalk_table,
+	},
+	{ 0 },
 };
 
 static ctl_table atalk_root_table[] = {
-	{CTL_NET, "net", NULL, 0, 0555, atalk_dir_table},
-	{0}
+	{
+		.ctl_name	= CTL_NET,
+		.procname	= "net",
+		.mode		= 0555,
+		.child		= atalk_dir_table,
+	},
+	{ 0 },
 };
 
 static struct ctl_table_header *atalk_table_header;