From 202913897d450740ad18576dd90c772165a084ec Mon Sep 17 00:00:00 2001 From: Hideaki Yoshifuji Date: Sun, 2 Mar 2003 09:47:53 -0800 Subject: [PATCH] [IPV6]: More C99 initializers. --- net/ipv6/addrconf.c | 222 +++++++++++++++++++++++++++++++------------- net/ipv6/route.c | 106 +++++++++++++++------ net/ipv6/sit.c | 3 +- 3 files changed, 235 insertions(+), 96 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index b9b9f4a3f4d57..6008ffc6fbcd1 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2319,75 +2319,163 @@ static struct addrconf_sysctl_table ctl_table addrconf_proto_dir[2]; ctl_table addrconf_root_dir[2]; } addrconf_sysctl = { - NULL, - {{NET_IPV6_FORWARDING, "forwarding", - &ipv6_devconf.forwarding, sizeof(int), 0644, NULL, - &addrconf_sysctl_forward}, - - {NET_IPV6_HOP_LIMIT, "hop_limit", - &ipv6_devconf.hop_limit, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_MTU, "mtu", - &ipv6_devconf.mtu6, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_ACCEPT_RA, "accept_ra", - &ipv6_devconf.accept_ra, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_ACCEPT_REDIRECTS, "accept_redirects", - &ipv6_devconf.accept_redirects, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_AUTOCONF, "autoconf", - &ipv6_devconf.autoconf, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_DAD_TRANSMITS, "dad_transmits", - &ipv6_devconf.dad_transmits, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_RTR_SOLICITS, "router_solicitations", - &ipv6_devconf.rtr_solicits, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_RTR_SOLICIT_INTERVAL, "router_solicitation_interval", - &ipv6_devconf.rtr_solicit_interval, sizeof(int), 0644, NULL, - &proc_dointvec_jiffies}, - - {NET_IPV6_RTR_SOLICIT_DELAY, "router_solicitation_delay", - &ipv6_devconf.rtr_solicit_delay, sizeof(int), 0644, NULL, - &proc_dointvec_jiffies}, - + .sysctl_header = NULL, + .addrconf_vars = { + { + .ctl_name = NET_IPV6_FORWARDING, + .procname = "forwarding", + .data = &ipv6_devconf.forwarding, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &addrconf_sysctl_forward, + }, + { + .ctl_name = NET_IPV6_HOP_LIMIT, + .procname = "hop_limit", + .data = &ipv6_devconf.hop_limit, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { + .ctl_name = NET_IPV6_MTU, + .procname = "mtu", + .data = &ipv6_devconf.mtu6, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_ACCEPT_RA, + .procname = "accept_ra", + .data = &ipv6_devconf.accept_ra, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_ACCEPT_REDIRECTS, + .procname = "accept_redirects", + .data = &ipv6_devconf.accept_redirects, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_AUTOCONF, + .procname = "autoconf", + .data = &ipv6_devconf.autoconf, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_DAD_TRANSMITS, + .procname = "dad_transmits", + .data = &ipv6_devconf.dad_transmits, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_RTR_SOLICITS, + .procname = "router_solicitations", + .data = &ipv6_devconf.rtr_solicits, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_RTR_SOLICIT_INTERVAL, + .procname = "router_solicitation_interval", + .data = &ipv6_devconf.rtr_solicit_interval, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, + { + .ctl_name = NET_IPV6_RTR_SOLICIT_DELAY, + .procname = "router_solicitation_delay", + .data = &ipv6_devconf.rtr_solicit_delay, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, #ifdef CONFIG_IPV6_PRIVACY - {NET_IPV6_USE_TEMPADDR, "use_tempaddr", - &ipv6_devconf.use_tempaddr, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_TEMP_VALID_LFT, "temp_valid_lft", - &ipv6_devconf.temp_valid_lft, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_TEMP_PREFERED_LFT, "temp_prefered_lft", - &ipv6_devconf.temp_prefered_lft, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_REGEN_MAX_RETRY, "regen_max_retry", - &ipv6_devconf.regen_max_retry, sizeof(int), 0644, NULL, - &proc_dointvec}, - - {NET_IPV6_MAX_DESYNC_FACTOR, "max_desync_factor", - &ipv6_devconf.max_desync_factor, sizeof(int), 0644, NULL, - &proc_dointvec}, + { + .ctl_name = NET_IPV6_USE_TEMPADDR, + .procname = "use_tempaddr", + .data = &ipv6_devconf.use_tempaddr, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_TEMP_VALID_LFT, + .procname = "temp_valid_lft", + .data = &ipv6_devconf.temp_valid_lft, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_TEMP_PREFERED_LFT, + .procname = "temp_prefered_lft", + .data = &ipv6_devconf.temp_prefered_lft, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_REGEN_MAX_RETRY, + .procname = "regen_max_retry", + .data = &ipv6_devconf.regen_max_retry, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_MAX_DESYNC_FACTOR, + .procname = "max_desync_factor", + .data = &ipv6_devconf.max_desync_factor, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, #endif - - {0}}, - - {{NET_PROTO_CONF_ALL, "all", NULL, 0, 0555, addrconf_sysctl.addrconf_vars},{0}}, - {{NET_IPV6_CONF, "conf", NULL, 0, 0555, addrconf_sysctl.addrconf_dev},{0}}, - {{NET_IPV6, "ipv6", NULL, 0, 0555, addrconf_sysctl.addrconf_conf_dir},{0}}, - {{CTL_NET, "net", NULL, 0, 0555, addrconf_sysctl.addrconf_proto_dir},{0}} + }, + .addrconf_dev = { + { + .ctl_name = NET_PROTO_CONF_ALL, + .procname = "all", + .mode = 0555, + .child = addrconf_sysctl.addrconf_vars, + }, + }, + .addrconf_conf_dir = { + { + .ctl_name = NET_IPV6_CONF, + .procname = "conf", + .mode = 0555, + .child = addrconf_sysctl.addrconf_dev, + }, + }, + .addrconf_proto_dir = { + { + .ctl_name = NET_IPV6, + .procname = "ipv6", + .mode = 0555, + .child = addrconf_sysctl.addrconf_conf_dir, + }, + }, + .addrconf_root_dir = { + { + .ctl_name = CTL_NET, + .procname = "net", + .mode = 0555, + .child = addrconf_sysctl.addrconf_proto_dir, + }, + }, }; static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf *p) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 0ecff573bdd64..ecef76caf4350 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1777,34 +1777,84 @@ int ipv6_sysctl_rtcache_flush(ctl_table *ctl, int write, struct file * filp, } ctl_table ipv6_route_table[] = { - {NET_IPV6_ROUTE_FLUSH, "flush", - &flush_delay, sizeof(int), 0644, NULL, - &ipv6_sysctl_rtcache_flush}, - {NET_IPV6_ROUTE_GC_THRESH, "gc_thresh", - &ip6_dst_ops.gc_thresh, sizeof(int), 0644, NULL, - &proc_dointvec}, - {NET_IPV6_ROUTE_MAX_SIZE, "max_size", - &ip6_rt_max_size, sizeof(int), 0644, NULL, - &proc_dointvec}, - {NET_IPV6_ROUTE_GC_MIN_INTERVAL, "gc_min_interval", - &ip6_rt_gc_min_interval, sizeof(int), 0644, NULL, - &proc_dointvec_jiffies, &sysctl_jiffies}, - {NET_IPV6_ROUTE_GC_TIMEOUT, "gc_timeout", - &ip6_rt_gc_timeout, sizeof(int), 0644, NULL, - &proc_dointvec_jiffies, &sysctl_jiffies}, - {NET_IPV6_ROUTE_GC_INTERVAL, "gc_interval", - &ip6_rt_gc_interval, sizeof(int), 0644, NULL, - &proc_dointvec_jiffies, &sysctl_jiffies}, - {NET_IPV6_ROUTE_GC_ELASTICITY, "gc_elasticity", - &ip6_rt_gc_elasticity, sizeof(int), 0644, NULL, - &proc_dointvec_jiffies, &sysctl_jiffies}, - {NET_IPV6_ROUTE_MTU_EXPIRES, "mtu_expires", - &ip6_rt_mtu_expires, sizeof(int), 0644, NULL, - &proc_dointvec_jiffies, &sysctl_jiffies}, - {NET_IPV6_ROUTE_MIN_ADVMSS, "min_adv_mss", - &ip6_rt_min_advmss, sizeof(int), 0644, NULL, - &proc_dointvec_jiffies, &sysctl_jiffies}, - {0} + { + .ctl_name = NET_IPV6_ROUTE_FLUSH, + .procname = "flush", + .data = &flush_delay, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &ipv6_sysctl_rtcache_flush + }, + { + .ctl_name = NET_IPV6_ROUTE_GC_THRESH, + .procname = "gc_thresh", + .data = &ip6_dst_ops.gc_thresh, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_ROUTE_MAX_SIZE, + .procname = "max_size", + .data = &ip6_rt_max_size, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV6_ROUTE_GC_MIN_INTERVAL, + .procname = "gc_min_interval", + .data = &ip6_rt_gc_min_interval, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + .strategy = &sysctl_jiffies, + }, + { + .ctl_name = NET_IPV6_ROUTE_GC_TIMEOUT, + .procname = "gc_timeout", + .data = &ip6_rt_gc_timeout, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + .strategy = &sysctl_jiffies, + }, + { + .ctl_name = NET_IPV6_ROUTE_GC_INTERVAL, + .procname = "gc_interval", + .data = &ip6_rt_gc_interval, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + .strategy = &sysctl_jiffies, + }, + { + .ctl_name = NET_IPV6_ROUTE_GC_ELASTICITY, + .procname = "gc_elasticity", + .data = &ip6_rt_gc_elasticity, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + .strategy = &sysctl_jiffies, + }, + { + .ctl_name = NET_IPV6_ROUTE_MTU_EXPIRES, + .procname = "mtu_expires", + .data = &ip6_rt_mtu_expires, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + .strategy = &sysctl_jiffies, + }, + { + .ctl_name = NET_IPV6_ROUTE_MIN_ADVMSS, + .procname = "min_adv_mss", + .data = &ip6_rt_min_advmss, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + .strategy = &sysctl_jiffies, + }, }; #endif diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 1ca86b7af7173..652066452aa98 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -68,7 +68,8 @@ static struct net_device ipip6_fb_tunnel_dev = { }; static struct ip_tunnel ipip6_fb_tunnel = { - NULL, &ipip6_fb_tunnel_dev, {0, }, 0, 0, 0, 0, 0, 0, 0, {"sit0", } + .dev = &ipip6_fb_tunnel_dev, + .parms = { .name = "sit0" } }; static struct ip_tunnel *tunnels_r_l[HASH_SIZE]; -- 2.53.0