Skip to content

L
linux
Commit 3acb3eb4 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files
Options

[X25] convert sysctl_net_x25 to use designated initializers

parent 267e891b
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 25 deletions
net/x25/sysctl_net_x25.c
View file @ 3acb3eb4
...@@ -13,38 +13,88 @@ ...@@ -13,38 +13,88 @@
#include <linux/init.h> #include <linux/init.h>
#include <net/x25.h> #include <net/x25.h>
static int min_timer[] = {1 * HZ}; static int min_timer[] = { 1 * HZ };
static int max_timer[] = {300 * HZ}; static int max_timer[] = { 300 * HZ };
static struct ctl_table_header *x25_table_header; static struct ctl_table_header *x25_table_header;
static ctl_table x25_table[] = { static struct ctl_table x25_table[] = {
{NET_X25_RESTART_REQUEST_TIMEOUT, "restart_request_timeout", {
&sysctl_x25_restart_request_timeout, sizeof(int), 0644, NULL, .ctl_name = NET_X25_RESTART_REQUEST_TIMEOUT,
&proc_dointvec_minmax, &sysctl_intvec, NULL, &min_timer, &max_timer}, .procname = "restart_request_timeout",
{NET_X25_CALL_REQUEST_TIMEOUT, "call_request_timeout", .data = &sysctl_x25_restart_request_timeout,
&sysctl_x25_call_request_timeout, sizeof(int), 0644, NULL, .maxlen = sizeof(int),
&proc_dointvec_minmax, &sysctl_intvec, NULL, &min_timer, &max_timer}, .mode = 0644,
{NET_X25_RESET_REQUEST_TIMEOUT, "reset_request_timeout", .proc_handler = &proc_dointvec_minmax,
&sysctl_x25_reset_request_timeout, sizeof(int), 0644, NULL, .strategy = &sysctl_intvec,
&proc_dointvec_minmax, &sysctl_intvec, NULL, &min_timer, &max_timer}, .extra1 = &min_timer,
{NET_X25_CLEAR_REQUEST_TIMEOUT, "clear_request_timeout", .extra2 = &max_timer,
&sysctl_x25_clear_request_timeout, sizeof(int), 0644, NULL, },
&proc_dointvec_minmax, &sysctl_intvec, NULL, &min_timer, &max_timer}, {
{NET_X25_ACK_HOLD_BACK_TIMEOUT, "acknowledgement_hold_back_timeout", .ctl_name = NET_X25_CALL_REQUEST_TIMEOUT,
&sysctl_x25_ack_holdback_timeout, sizeof(int), 0644, NULL, .procname = "call_request_timeout",
&proc_dointvec_minmax, &sysctl_intvec, NULL, &min_timer, &max_timer}, .data = &sysctl_x25_call_request_timeout,
{0} .maxlen = sizeof(int),
.mode = 0644,
.proc_handler = &proc_dointvec_minmax,
.strategy = &sysctl_intvec,
.extra1 = &min_timer,
.extra2 = &max_timer,
},
{
.ctl_name = NET_X25_RESET_REQUEST_TIMEOUT,
.procname = "reset_request_timeout",
.data = &sysctl_x25_reset_request_timeout,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = &proc_dointvec_minmax,
.strategy = &sysctl_intvec,
.extra1 = &min_timer,
.extra2 = &max_timer,
},
{
.ctl_name = NET_X25_CLEAR_REQUEST_TIMEOUT,
.procname = "clear_request_timeout",
.data = &sysctl_x25_clear_request_timeout,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = &proc_dointvec_minmax,
.strategy = &sysctl_intvec,
.extra1 = &min_timer,
.extra2 = &max_timer,
},
{
.ctl_name = NET_X25_ACK_HOLD_BACK_TIMEOUT,
.procname = "acknowledgement_hold_back_timeout",
.data = &sysctl_x25_ack_holdback_timeout,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = &proc_dointvec_minmax,
.strategy = &sysctl_intvec,
.extra1 = &min_timer,
.extra2 = &max_timer,
},
{ 0, },
}; };
static ctl_table x25_dir_table[] = { static struct ctl_table x25_dir_table[] = {
{NET_X25, "x25", NULL, 0, 0555, x25_table}, {
{0} .ctl_name = NET_X25,
.procname = "x25",
.mode = 0555,
.child = x25_table,
},
{ 0, },
}; };
static ctl_table x25_root_table[] = { static struct ctl_table x25_root_table[] = {
{CTL_NET, "net", NULL, 0, 0555, x25_dir_table}, {
{0} .ctl_name = CTL_NET,
.procname = "net",
.mode = 0555,
.child = x25_dir_table,
},
{ 0, },
}; };
void __init x25_register_sysctl(void) void __init x25_register_sysctl(void)
......
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