diff options
| -rw-r--r-- | net/x25/sysctl_net_x25.c | 100 |
1 files changed, 75 insertions, 25 deletions
diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c index 92b3b8f8f7c5..c288dd8f5f48 100644 --- a/net/x25/sysctl_net_x25.c +++ b/net/x25/sysctl_net_x25.c @@ -13,38 +13,88 @@ #include <linux/init.h> #include <net/x25.h> -static int min_timer[] = {1 * HZ}; -static int max_timer[] = {300 * HZ}; +static int min_timer[] = { 1 * HZ }; +static int max_timer[] = { 300 * HZ }; static struct ctl_table_header *x25_table_header; -static ctl_table x25_table[] = { - {NET_X25_RESTART_REQUEST_TIMEOUT, "restart_request_timeout", - &sysctl_x25_restart_request_timeout, sizeof(int), 0644, NULL, - &proc_dointvec_minmax, &sysctl_intvec, NULL, &min_timer, &max_timer}, - {NET_X25_CALL_REQUEST_TIMEOUT, "call_request_timeout", - &sysctl_x25_call_request_timeout, sizeof(int), 0644, NULL, - &proc_dointvec_minmax, &sysctl_intvec, NULL, &min_timer, &max_timer}, - {NET_X25_RESET_REQUEST_TIMEOUT, "reset_request_timeout", - &sysctl_x25_reset_request_timeout, sizeof(int), 0644, NULL, - &proc_dointvec_minmax, &sysctl_intvec, NULL, &min_timer, &max_timer}, - {NET_X25_CLEAR_REQUEST_TIMEOUT, "clear_request_timeout", - &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", - &sysctl_x25_ack_holdback_timeout, sizeof(int), 0644, NULL, - &proc_dointvec_minmax, &sysctl_intvec, NULL, &min_timer, &max_timer}, - {0} +static struct ctl_table x25_table[] = { + { + .ctl_name = NET_X25_RESTART_REQUEST_TIMEOUT, + .procname = "restart_request_timeout", + .data = &sysctl_x25_restart_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_CALL_REQUEST_TIMEOUT, + .procname = "call_request_timeout", + .data = &sysctl_x25_call_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_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[] = { - {NET_X25, "x25", NULL, 0, 0555, x25_table}, - {0} +static struct ctl_table x25_dir_table[] = { + { + .ctl_name = NET_X25, + .procname = "x25", + .mode = 0555, + .child = x25_table, + }, + { 0, }, }; -static ctl_table x25_root_table[] = { - {CTL_NET, "net", NULL, 0, 0555, x25_dir_table}, - {0} +static struct ctl_table x25_root_table[] = { + { + .ctl_name = CTL_NET, + .procname = "net", + .mode = 0555, + .child = x25_dir_table, + }, + { 0, }, }; void __init x25_register_sysctl(void) |