Skip to content

L
linux
Commit 5df1f77f authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by David S. Miller
Browse files
Options

net/ipv6/addrconf: fix sysctl table indentation 

Separated from previous patch for readability.
Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 607ea7cd
Hide whitespace changes
Inline Side-by-side
Showing with 307 additions and 309 deletions
net/ipv6/addrconf.c
View file @ 5df1f77f
...@@ -5620,323 +5620,321 @@ int addrconf_sysctl_ignore_routes_with_linkdown(struct ctl_table *ctl, ...@@ -5620,323 +5620,321 @@ int addrconf_sysctl_ignore_routes_with_linkdown(struct ctl_table *ctl,
} }
static const struct ctl_table addrconf_sysctl[] = { static const struct ctl_table addrconf_sysctl[] = {
{ {
.procname = "forwarding", .procname = "forwarding",
.data = &ipv6_devconf.forwarding, .data = &ipv6_devconf.forwarding,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = addrconf_sysctl_forward, .proc_handler = addrconf_sysctl_forward,
}, },
{ {
.procname = "hop_limit", .procname = "hop_limit",
.data = &ipv6_devconf.hop_limit, .data = &ipv6_devconf.hop_limit,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = addrconf_sysctl_hop_limit, .proc_handler = addrconf_sysctl_hop_limit,
}, },
{ {
.procname = "mtu", .procname = "mtu",
.data = &ipv6_devconf.mtu6, .data = &ipv6_devconf.mtu6,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = addrconf_sysctl_mtu, .proc_handler = addrconf_sysctl_mtu,
}, },
{ {
.procname = "accept_ra", .procname = "accept_ra",
.data = &ipv6_devconf.accept_ra, .data = &ipv6_devconf.accept_ra,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "accept_redirects", .procname = "accept_redirects",
.data = &ipv6_devconf.accept_redirects, .data = &ipv6_devconf.accept_redirects,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "autoconf", .procname = "autoconf",
.data = &ipv6_devconf.autoconf, .data = &ipv6_devconf.autoconf,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "dad_transmits", .procname = "dad_transmits",
.data = &ipv6_devconf.dad_transmits, .data = &ipv6_devconf.dad_transmits,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "router_solicitations", .procname = "router_solicitations",
.data = &ipv6_devconf.rtr_solicits, .data = &ipv6_devconf.rtr_solicits,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "router_solicitation_interval", .procname = "router_solicitation_interval",
.data = &ipv6_devconf.rtr_solicit_interval, .data = &ipv6_devconf.rtr_solicit_interval,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
}, },
{ {
.procname = "router_solicitation_delay", .procname = "router_solicitation_delay",
.data = &ipv6_devconf.rtr_solicit_delay, .data = &ipv6_devconf.rtr_solicit_delay,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
}, },
{ {
.procname = "force_mld_version", .procname = "force_mld_version",
.data = &ipv6_devconf.force_mld_version, .data = &ipv6_devconf.force_mld_version,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "mldv1_unsolicited_report_interval", .procname = "mldv1_unsolicited_report_interval",
.data = .data =
&ipv6_devconf.mldv1_unsolicited_report_interval, &ipv6_devconf.mldv1_unsolicited_report_interval,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_ms_jiffies, .proc_handler = proc_dointvec_ms_jiffies,
}, },
{ {
.procname = "mldv2_unsolicited_report_interval", .procname = "mldv2_unsolicited_report_interval",
.data = .data =
&ipv6_devconf.mldv2_unsolicited_report_interval, &ipv6_devconf.mldv2_unsolicited_report_interval,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_ms_jiffies, .proc_handler = proc_dointvec_ms_jiffies,
}, },
{ {
.procname = "use_tempaddr", .procname = "use_tempaddr",
.data = &ipv6_devconf.use_tempaddr, .data = &ipv6_devconf.use_tempaddr,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "temp_valid_lft", .procname = "temp_valid_lft",
.data = &ipv6_devconf.temp_valid_lft, .data = &ipv6_devconf.temp_valid_lft,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "temp_prefered_lft", .procname = "temp_prefered_lft",
.data = &ipv6_devconf.temp_prefered_lft, .data = &ipv6_devconf.temp_prefered_lft,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "regen_max_retry", .procname = "regen_max_retry",
.data = &ipv6_devconf.regen_max_retry, .data = &ipv6_devconf.regen_max_retry,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "max_desync_factor", .procname = "max_desync_factor",
.data = &ipv6_devconf.max_desync_factor, .data = &ipv6_devconf.max_desync_factor,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "max_addresses", .procname = "max_addresses",
.data = &ipv6_devconf.max_addresses, .data = &ipv6_devconf.max_addresses,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "accept_ra_defrtr", .procname = "accept_ra_defrtr",
.data = &ipv6_devconf.accept_ra_defrtr, .data = &ipv6_devconf.accept_ra_defrtr,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "accept_ra_min_hop_limit", .procname = "accept_ra_min_hop_limit",
.data = &ipv6_devconf.accept_ra_min_hop_limit, .data = &ipv6_devconf.accept_ra_min_hop_limit,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "accept_ra_pinfo", .procname = "accept_ra_pinfo",
.data = &ipv6_devconf.accept_ra_pinfo, .data = &ipv6_devconf.accept_ra_pinfo,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#ifdef CONFIG_IPV6_ROUTER_PREF #ifdef CONFIG_IPV6_ROUTER_PREF
{ {
.procname = "accept_ra_rtr_pref", .procname = "accept_ra_rtr_pref",
.data = &ipv6_devconf.accept_ra_rtr_pref, .data = &ipv6_devconf.accept_ra_rtr_pref,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "router_probe_interval", .procname = "router_probe_interval",
.data = &ipv6_devconf.rtr_probe_interval, .data = &ipv6_devconf.rtr_probe_interval,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
}, },
#ifdef CONFIG_IPV6_ROUTE_INFO #ifdef CONFIG_IPV6_ROUTE_INFO
{ {
.procname = "accept_ra_rt_info_max_plen", .procname = "accept_ra_rt_info_max_plen",
.data = &ipv6_devconf.accept_ra_rt_info_max_plen, .data = &ipv6_devconf.accept_ra_rt_info_max_plen,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
#endif #endif
{ {
.procname = "proxy_ndp", .procname = "proxy_ndp",
.data = &ipv6_devconf.proxy_ndp, .data = &ipv6_devconf.proxy_ndp,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = addrconf_sysctl_proxy_ndp, .proc_handler = addrconf_sysctl_proxy_ndp,
}, },
{ {
.procname = "accept_source_route", .procname = "accept_source_route",
.data = &ipv6_devconf.accept_source_route, .data = &ipv6_devconf.accept_source_route,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#ifdef CONFIG_IPV6_OPTIMISTIC_DAD #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
{ {
.procname = "optimistic_dad", .procname = "optimistic_dad",
.data = &ipv6_devconf.optimistic_dad, .data = &ipv6_devconf.optimistic_dad,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
},
}, {
{ .procname = "use_optimistic",
.procname = "use_optimistic", .data = &ipv6_devconf.use_optimistic,
.data = &ipv6_devconf.use_optimistic, .maxlen = sizeof(int),
.maxlen = sizeof(int), .mode = 0644,
.mode = 0644, .proc_handler = proc_dointvec,
.proc_handler = proc_dointvec, },
},
#endif #endif
#ifdef CONFIG_IPV6_MROUTE #ifdef CONFIG_IPV6_MROUTE
{ {
.procname = "mc_forwarding", .procname = "mc_forwarding",
.data = &ipv6_devconf.mc_forwarding, .data = &ipv6_devconf.mc_forwarding,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
{ {
.procname = "disable_ipv6", .procname = "disable_ipv6",
.data = &ipv6_devconf.disable_ipv6, .data = &ipv6_devconf.disable_ipv6,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = addrconf_sysctl_disable, .proc_handler = addrconf_sysctl_disable,
}, },
{ {
.procname = "accept_dad", .procname = "accept_dad",
.data = &ipv6_devconf.accept_dad, .data = &ipv6_devconf.accept_dad,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "force_tllao", .procname = "force_tllao",
.data = &ipv6_devconf.force_tllao, .data = &ipv6_devconf.force_tllao,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec .proc_handler = proc_dointvec
}, },
{ {
.procname = "ndisc_notify", .procname = "ndisc_notify",
.data = &ipv6_devconf.ndisc_notify, .data = &ipv6_devconf.ndisc_notify,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec .proc_handler = proc_dointvec
}, },
{ {
.procname = "suppress_frag_ndisc", .procname = "suppress_frag_ndisc",
.data = &ipv6_devconf.suppress_frag_ndisc, .data = &ipv6_devconf.suppress_frag_ndisc,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec .proc_handler = proc_dointvec
}, },
{ {
.procname = "accept_ra_from_local", .procname = "accept_ra_from_local",
.data = &ipv6_devconf.accept_ra_from_local, .data = &ipv6_devconf.accept_ra_from_local,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "accept_ra_mtu", .procname = "accept_ra_mtu",
.data = &ipv6_devconf.accept_ra_mtu, .data = &ipv6_devconf.accept_ra_mtu,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "stable_secret", .procname = "stable_secret",
.data = &ipv6_devconf.stable_secret, .data = &ipv6_devconf.stable_secret,
.maxlen = IPV6_MAX_STRLEN, .maxlen = IPV6_MAX_STRLEN,
.mode = 0600, .mode = 0600,
.proc_handler = addrconf_sysctl_stable_secret, .proc_handler = addrconf_sysctl_stable_secret,
}, },
{ {
.procname = "use_oif_addrs_only", .procname = "use_oif_addrs_only",
.data = &ipv6_devconf.use_oif_addrs_only, .data = &ipv6_devconf.use_oif_addrs_only,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "ignore_routes_with_linkdown", .procname = "ignore_routes_with_linkdown",
.data = &ipv6_devconf.ignore_routes_with_linkdown, .data = &ipv6_devconf.ignore_routes_with_linkdown,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = addrconf_sysctl_ignore_routes_with_linkdown, .proc_handler = addrconf_sysctl_ignore_routes_with_linkdown,
}, },
{ {
.procname = "drop_unicast_in_l2_multicast", .procname = "drop_unicast_in_l2_multicast",
.data = &ipv6_devconf.drop_unicast_in_l2_multicast, .data = &ipv6_devconf.drop_unicast_in_l2_multicast,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "drop_unsolicited_na", .procname = "drop_unsolicited_na",
.data = &ipv6_devconf.drop_unsolicited_na, .data = &ipv6_devconf.drop_unsolicited_na,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "keep_addr_on_down", .procname = "keep_addr_on_down",
.data = &ipv6_devconf.keep_addr_on_down, .data = &ipv6_devconf.keep_addr_on_down,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
/* sentinel */ /* sentinel */
} }
}; };
static int __addrconf_sysctl_register(struct net *net, char *dev_name, static int __addrconf_sysctl_register(struct net *net, char *dev_name,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7