aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-03 21:21:05 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-03 21:21:05 -0500
commit6d9f239a1edb31d6133230f478fd1dc2da338ec5 (patch)
tree305fa0da95a49db4e342f3f3042f8be0968b03ce
parent6cf3f41e6c08bca6641a695449791c38a25f35ff (diff)
net: '&' redux
I want to compile out proc_* and sysctl_* handlers totally and stub them to NULL depending on config options, however usage of & will prevent this, since taking adress of NULL pointer will break compilation. So, drop & in front of every ->proc_handler and every ->strategy handler, it was never needed in fact. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat
-rw-r--r--net/802/tr.c2
-rw-r--r--net/appletalk/sysctl_net_atalk.c14
-rw-r--r--net/ax25/sysctl_net_ax25.c56
-rw-r--r--net/bridge/br_netfilter.c10
-rw-r--r--net/core/neighbour.c48
-rw-r--r--net/core/sysctl_net_core.c34
-rw-r--r--net/decnet/sysctl_net_decnet.c44
-rw-r--r--net/ipv4/ip_fragment.c14
-rw-r--r--net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c12
-rw-r--r--net/ipv4/netfilter/nf_conntrack_proto_icmp.c4
-rw-r--r--net/ipv4/route.c48
-rw-r--r--net/ipv4/sysctl_net_ipv4.c178
-rw-r--r--net/ipv6/addrconf.c62
-rw-r--r--net/ipv6/icmp.c4
-rw-r--r--net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c2
-rw-r--r--net/ipv6/netfilter/nf_conntrack_reasm.c6
-rw-r--r--net/ipv6/reassembly.c12
-rw-r--r--net/ipv6/route.c34
-rw-r--r--net/ipv6/sysctl_net_ipv6.c4
-rw-r--r--net/ipx/sysctl_net_ipx.c2
-rw-r--r--net/irda/irsysctl.c50
-rw-r--r--net/llc/sysctl_net_llc.c20
-rw-r--r--net/netfilter/ipvs/ip_vs_ctl.c46
-rw-r--r--net/netfilter/ipvs/ip_vs_lblc.c2
-rw-r--r--net/netfilter/ipvs/ip_vs_lblcr.c2
-rw-r--r--net/netfilter/nf_conntrack_acct.c2
-rw-r--r--net/netfilter/nf_conntrack_proto_generic.c4
-rw-r--r--net/netfilter/nf_conntrack_proto_sctp.c28
-rw-r--r--net/netfilter/nf_conntrack_proto_tcp.c50
-rw-r--r--net/netfilter/nf_conntrack_proto_udp.c8
-rw-r--r--net/netfilter/nf_conntrack_proto_udplite.c4
-rw-r--r--net/netfilter/nf_conntrack_standalone.c16
-rw-r--r--net/netrom/sysctl_net_netrom.c48
-rw-r--r--net/phonet/sysctl.c2
-rw-r--r--net/rose/sysctl_net_rose.c40
-rw-r--r--net/sctp/sysctl.c82
-rw-r--r--net/unix/sysctl_net_unix.c2
-rw-r--r--net/x25/sysctl_net_x25.c22
38 files changed, 509 insertions, 509 deletions
diff --git a/net/802/tr.c b/net/802/tr.c
index 38f1f290c635..158150fee462 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -635,7 +635,7 @@ static struct ctl_table tr_table[] = {
635 .data = &sysctl_tr_rif_timeout, 635 .data = &sysctl_tr_rif_timeout,
636 .maxlen = sizeof(int), 636 .maxlen = sizeof(int),
637 .mode = 0644, 637 .mode = 0644,
638 .proc_handler = &proc_dointvec 638 .proc_handler = proc_dointvec
639 }, 639 },
640 { 0 }, 640 { 0 },
641}; 641};
diff --git a/net/appletalk/sysctl_net_atalk.c b/net/appletalk/sysctl_net_atalk.c
index 621805dfa2f4..8d237b15183b 100644
--- a/net/appletalk/sysctl_net_atalk.c
+++ b/net/appletalk/sysctl_net_atalk.c
@@ -17,8 +17,8 @@ static struct ctl_table atalk_table[] = {
17 .data = &sysctl_aarp_expiry_time, 17 .data = &sysctl_aarp_expiry_time,
18 .maxlen = sizeof(int), 18 .maxlen = sizeof(int),
19 .mode = 0644, 19 .mode = 0644,
20 .proc_handler = &proc_dointvec_jiffies, 20 .proc_handler = proc_dointvec_jiffies,
21 .strategy = &sysctl_jiffies, 21 .strategy = sysctl_jiffies,
22 }, 22 },
23 { 23 {
24 .ctl_name = NET_ATALK_AARP_TICK_TIME, 24 .ctl_name = NET_ATALK_AARP_TICK_TIME,
@@ -26,8 +26,8 @@ static struct ctl_table atalk_table[] = {
26 .data = &sysctl_aarp_tick_time, 26 .data = &sysctl_aarp_tick_time,
27 .maxlen = sizeof(int), 27 .maxlen = sizeof(int),
28 .mode = 0644, 28 .mode = 0644,
29 .proc_handler = &proc_dointvec_jiffies, 29 .proc_handler = proc_dointvec_jiffies,
30 .strategy = &sysctl_jiffies, 30 .strategy = sysctl_jiffies,
31 }, 31 },
32 { 32 {
33 .ctl_name = NET_ATALK_AARP_RETRANSMIT_LIMIT, 33 .ctl_name = NET_ATALK_AARP_RETRANSMIT_LIMIT,
@@ -35,7 +35,7 @@ static struct ctl_table atalk_table[] = {
35 .data = &sysctl_aarp_retransmit_limit, 35 .data = &sysctl_aarp_retransmit_limit,
36 .maxlen = sizeof(int), 36 .maxlen = sizeof(int),
37 .mode = 0644, 37 .mode = 0644,
38 .proc_handler = &proc_dointvec, 38 .proc_handler = proc_dointvec,
39 }, 39 },
40 { 40 {
41 .ctl_name = NET_ATALK_AARP_RESOLVE_TIME, 41 .ctl_name = NET_ATALK_AARP_RESOLVE_TIME,
@@ -43,8 +43,8 @@ static struct ctl_table atalk_table[] = {
43 .data = &sysctl_aarp_resolve_time, 43 .data = &sysctl_aarp_resolve_time,
44 .maxlen = sizeof(int), 44 .maxlen = sizeof(int),
45 .mode = 0644, 45 .mode = 0644,
46 .proc_handler = &proc_dointvec_jiffies, 46 .proc_handler = proc_dointvec_jiffies,
47 .strategy = &sysctl_jiffies, 47 .strategy = sysctl_jiffies,
48 }, 48 },
49 { 0 }, 49 { 0 },
50}; 50};
diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
index f288fc4aef9b..c1d877bb5dff 100644
--- a/net/ax25/sysctl_net_ax25.c
+++ b/net/ax25/sysctl_net_ax25.c
@@ -43,8 +43,8 @@ static const ctl_table ax25_param_table[] = {
43 .procname = "ip_default_mode", 43 .procname = "ip_default_mode",
44 .maxlen = sizeof(int), 44 .maxlen = sizeof(int),
45 .mode = 0644, 45 .mode = 0644,
46 .proc_handler = &proc_dointvec_minmax, 46 .proc_handler = proc_dointvec_minmax,
47 .strategy = &sysctl_intvec, 47 .strategy = sysctl_intvec,
48 .extra1 = &min_ipdefmode, 48 .extra1 = &min_ipdefmode,
49 .extra2 = &max_ipdefmode 49 .extra2 = &max_ipdefmode
50 }, 50 },
@@ -53,8 +53,8 @@ static const ctl_table ax25_param_table[] = {
53 .procname = "ax25_default_mode", 53 .procname = "ax25_default_mode",
54 .maxlen = sizeof(int), 54 .maxlen = sizeof(int),
55 .mode = 0644, 55 .mode = 0644,
56 .proc_handler = &proc_dointvec_minmax, 56 .proc_handler = proc_dointvec_minmax,
57 .strategy = &sysctl_intvec, 57 .strategy = sysctl_intvec,
58 .extra1 = &min_axdefmode, 58 .extra1 = &min_axdefmode,
59 .extra2 = &max_axdefmode 59 .extra2 = &max_axdefmode
60 }, 60 },
@@ -63,8 +63,8 @@ static const ctl_table ax25_param_table[] = {
63 .procname = "backoff_type", 63 .procname = "backoff_type",
64 .maxlen = sizeof(int), 64 .maxlen = sizeof(int),
65 .mode = 0644, 65 .mode = 0644,
66 .proc_handler = &proc_dointvec_minmax, 66 .proc_handler = proc_dointvec_minmax,
67 .strategy = &sysctl_intvec, 67 .strategy = sysctl_intvec,
68 .extra1 = &min_backoff, 68 .extra1 = &min_backoff,
69 .extra2 = &max_backoff 69 .extra2 = &max_backoff
70 }, 70 },
@@ -73,8 +73,8 @@ static const ctl_table ax25_param_table[] = {
73 .procname = "connect_mode", 73 .procname = "connect_mode",
74 .maxlen = sizeof(int), 74 .maxlen = sizeof(int),
75 .mode = 0644, 75 .mode = 0644,
76 .proc_handler = &proc_dointvec_minmax, 76 .proc_handler = proc_dointvec_minmax,
77 .strategy = &sysctl_intvec, 77 .strategy = sysctl_intvec,
78 .extra1 = &min_conmode, 78 .extra1 = &min_conmode,
79 .extra2 = &max_conmode 79 .extra2 = &max_conmode
80 }, 80 },
@@ -83,8 +83,8 @@ static const ctl_table ax25_param_table[] = {
83 .procname = "standard_window_size", 83 .procname = "standard_window_size",
84 .maxlen = sizeof(int), 84 .maxlen = sizeof(int),
85 .mode = 0644, 85 .mode = 0644,
86 .proc_handler = &proc_dointvec_minmax, 86 .proc_handler = proc_dointvec_minmax,
87 .strategy = &sysctl_intvec, 87 .strategy = sysctl_intvec,
88 .extra1 = &min_window, 88 .extra1 = &min_window,
89 .extra2 = &max_window 89 .extra2 = &max_window
90 }, 90 },
@@ -93,8 +93,8 @@ static const ctl_table ax25_param_table[] = {
93 .procname = "extended_window_size", 93 .procname = "extended_window_size",
94 .maxlen = sizeof(int), 94 .maxlen = sizeof(int),
95 .mode = 0644, 95 .mode = 0644,
96 .proc_handler = &proc_dointvec_minmax, 96 .proc_handler = proc_dointvec_minmax,
97 .strategy = &sysctl_intvec, 97 .strategy = sysctl_intvec,
98 .extra1 = &min_ewindow, 98 .extra1 = &min_ewindow,
99 .extra2 = &max_ewindow 99 .extra2 = &max_ewindow
100 }, 100 },
@@ -103,8 +103,8 @@ static const ctl_table ax25_param_table[] = {
103 .procname = "t1_timeout", 103 .procname = "t1_timeout",
104 .maxlen = sizeof(int), 104 .maxlen = sizeof(int),
105 .mode = 0644, 105 .mode = 0644,
106 .proc_handler = &proc_dointvec_minmax, 106 .proc_handler = proc_dointvec_minmax,
107 .strategy = &sysctl_intvec, 107 .strategy = sysctl_intvec,
108 .extra1 = &min_t1, 108 .extra1 = &min_t1,
109 .extra2 = &max_t1 109 .extra2 = &max_t1
110 }, 110 },
@@ -113,8 +113,8 @@ static const ctl_table ax25_param_table[] = {
113 .procname = "t2_timeout", 113 .procname = "t2_timeout",
114 .maxlen = sizeof(int), 114 .maxlen = sizeof(int),
115 .mode = 0644, 115 .mode = 0644,
116 .proc_handler = &proc_dointvec_minmax, 116 .proc_handler = proc_dointvec_minmax,
117 .strategy = &sysctl_intvec, 117 .strategy = sysctl_intvec,
118 .extra1 = &min_t2, 118 .extra1 = &min_t2,
119 .extra2 = &max_t2 119 .extra2 = &max_t2
120 }, 120 },
@@ -123,8 +123,8 @@ static const ctl_table ax25_param_table[] = {
123 .procname = "t3_timeout", 123 .procname = "t3_timeout",
124 .maxlen = sizeof(int), 124 .maxlen = sizeof(int),
125 .mode = 0644, 125 .mode = 0644,
126 .proc_handler = &proc_dointvec_minmax, 126 .proc_handler = proc_dointvec_minmax,
127 .strategy = &sysctl_intvec, 127 .strategy = sysctl_intvec,
128 .extra1 = &min_t3, 128 .extra1 = &min_t3,
129 .extra2 = &max_t3 129 .extra2 = &max_t3
130 }, 130 },
@@ -133,8 +133,8 @@ static const ctl_table ax25_param_table[] = {
133 .procname = "idle_timeout", 133 .procname = "idle_timeout",
134 .maxlen = sizeof(int), 134 .maxlen = sizeof(int),
135 .mode = 0644, 135 .mode = 0644,
136 .proc_handler = &proc_dointvec_minmax, 136 .proc_handler = proc_dointvec_minmax,
137 .strategy = &sysctl_intvec, 137 .strategy = sysctl_intvec,
138 .extra1 = &min_idle, 138 .extra1 = &min_idle,
139 .extra2 = &max_idle 139 .extra2 = &max_idle
140 }, 140 },
@@ -143,8 +143,8 @@ static const ctl_table ax25_param_table[] = {
143 .procname = "maximum_retry_count", 143 .procname = "maximum_retry_count",
144 .maxlen = sizeof(int), 144 .maxlen = sizeof(int),
145 .mode = 0644, 145 .mode = 0644,
146 .proc_handler = &proc_dointvec_minmax, 146 .proc_handler = proc_dointvec_minmax,
147 .strategy = &sysctl_intvec, 147 .strategy = sysctl_intvec,
148 .extra1 = &min_n2, 148 .extra1 = &min_n2,
149 .extra2 = &max_n2 149 .extra2 = &max_n2
150 }, 150 },
@@ -153,8 +153,8 @@ static const ctl_table ax25_param_table[] = {
153 .procname = "maximum_packet_length", 153 .procname = "maximum_packet_length",
154 .maxlen = sizeof(int), 154 .maxlen = sizeof(int),
155 .mode = 0644, 155 .mode = 0644,
156 .proc_handler = &proc_dointvec_minmax, 156 .proc_handler = proc_dointvec_minmax,
157 .strategy = &sysctl_intvec, 157 .strategy = sysctl_intvec,
158 .extra1 = &min_paclen, 158 .extra1 = &min_paclen,
159 .extra2 = &max_paclen 159 .extra2 = &max_paclen
160 }, 160 },
@@ -163,8 +163,8 @@ static const ctl_table ax25_param_table[] = {
163 .procname = "protocol", 163 .procname = "protocol",
164 .maxlen = sizeof(int), 164 .maxlen = sizeof(int),
165 .mode = 0644, 165 .mode = 0644,
166 .proc_handler = &proc_dointvec_minmax, 166 .proc_handler = proc_dointvec_minmax,
167 .strategy = &sysctl_intvec, 167 .strategy = sysctl_intvec,
168 .extra1 = &min_proto, 168 .extra1 = &min_proto,
169 .extra2 = &max_proto 169 .extra2 = &max_proto
170 }, 170 },
@@ -174,8 +174,8 @@ static const ctl_table ax25_param_table[] = {
174 .procname = "dama_slave_timeout", 174 .procname = "dama_slave_timeout",
175 .maxlen = sizeof(int), 175 .maxlen = sizeof(int),
176 .mode = 0644, 176 .mode = 0644,
177 .proc_handler = &proc_dointvec_minmax, 177 .proc_handler = proc_dointvec_minmax,
178 .strategy = &sysctl_intvec, 178 .strategy = sysctl_intvec,
179 .extra1 = &min_ds_timeout, 179 .extra1 = &min_ds_timeout,
180 .extra2 = &max_ds_timeout 180 .extra2 = &max_ds_timeout
181 }, 181 },
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index fa5cda4e552a..db6176d96e71 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -938,35 +938,35 @@ static ctl_table brnf_table[] = {
938 .data = &brnf_call_arptables, 938 .data = &brnf_call_arptables,
939 .maxlen = sizeof(int), 939 .maxlen = sizeof(int),
940 .mode = 0644, 940 .mode = 0644,
941 .proc_handler = &brnf_sysctl_call_tables, 941 .proc_handler = brnf_sysctl_call_tables,
942 }, 942 },
943 { 943 {
944 .procname = "bridge-nf-call-iptables", 944 .procname = "bridge-nf-call-iptables",
945 .data = &brnf_call_iptables, 945 .data = &brnf_call_iptables,
946 .maxlen = sizeof(int), 946 .maxlen = sizeof(int),
947 .mode = 0644, 947 .mode = 0644,
948 .proc_handler = &brnf_sysctl_call_tables, 948 .proc_handler = brnf_sysctl_call_tables,
949 }, 949 },
950 { 950 {
951 .procname = "bridge-nf-call-ip6tables", 951 .procname = "bridge-nf-call-ip6tables",
952 .data = &brnf_call_ip6tables, 952 .data = &brnf_call_ip6tables,
953 .maxlen = sizeof(int), 953 .maxlen = sizeof(int),
954 .mode = 0644, 954 .mode = 0644,
955 .proc_handler = &brnf_sysctl_call_tables, 955 .proc_handler = brnf_sysctl_call_tables,
956 }, 956 },
957 { 957 {
958 .procname = "bridge-nf-filter-vlan-tagged", 958 .procname = "bridge-nf-filter-vlan-tagged",
959 .data = &brnf_filter_vlan_tagged, 959 .data = &brnf_filter_vlan_tagged,
960 .maxlen = sizeof(int), 960 .maxlen = sizeof(int),
961 .mode = 0644, 961 .mode = 0644,
962 .proc_handler = &brnf_sysctl_call_tables, 962 .proc_handler = brnf_sysctl_call_tables,
963 }, 963 },
964 { 964 {
965 .procname = "bridge-nf-filter-pppoe-tagged", 965 .procname = "bridge-nf-filter-pppoe-tagged",
966 .data = &brnf_filter_pppoe_tagged, 966 .data = &brnf_filter_pppoe_tagged,
967 .maxlen = sizeof(int), 967 .maxlen = sizeof(int),
968 .mode = 0644, 968 .mode = 0644,
969 .proc_handler = &brnf_sysctl_call_tables, 969 .proc_handler = brnf_sysctl_call_tables,
970 }, 970 },
971 { .ctl_name = 0 } 971 { .ctl_name = 0 }
972}; 972};
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index b337a937ea52..d9bbe010e0ee 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2566,128 +2566,128 @@ static struct neigh_sysctl_table {
2566 .procname = "mcast_solicit", 2566 .procname = "mcast_solicit",
2567 .maxlen = sizeof(int), 2567 .maxlen = sizeof(int),
2568 .mode = 0644, 2568 .mode = 0644,
2569 .proc_handler = &proc_dointvec, 2569 .proc_handler = proc_dointvec,
2570 }, 2570 },
2571 { 2571 {
2572 .ctl_name = NET_NEIGH_UCAST_SOLICIT, 2572 .ctl_name = NET_NEIGH_UCAST_SOLICIT,
2573 .procname = "ucast_solicit", 2573 .procname = "ucast_solicit",
2574 .maxlen = sizeof(int), 2574 .maxlen = sizeof(int),
2575 .mode = 0644, 2575 .mode = 0644,
2576 .proc_handler = &proc_dointvec, 2576 .proc_handler = proc_dointvec,
2577 }, 2577 },
2578 { 2578 {
2579 .ctl_name = NET_NEIGH_APP_SOLICIT, 2579 .ctl_name = NET_NEIGH_APP_SOLICIT,
2580 .procname = "app_solicit", 2580 .procname = "app_solicit",
2581 .maxlen = sizeof(int), 2581 .maxlen = sizeof(int),
2582 .mode = 0644, 2582 .mode = 0644,
2583 .proc_handler = &proc_dointvec, 2583 .proc_handler = proc_dointvec,
2584 }, 2584 },
2585 { 2585 {
2586 .procname = "retrans_time", 2586 .procname = "retrans_time",
2587 .maxlen = sizeof(int), 2587 .maxlen = sizeof(int),
2588 .mode = 0644, 2588 .mode = 0644,
2589 .proc_handler = &proc_dointvec_userhz_jiffies, 2589 .proc_handler = proc_dointvec_userhz_jiffies,
2590 }, 2590 },
2591 { 2591 {
2592 .ctl_name = NET_NEIGH_REACHABLE_TIME, 2592 .ctl_name = NET_NEIGH_REACHABLE_TIME,
2593 .procname = "base_reachable_time", 2593 .procname = "base_reachable_time",
2594 .maxlen = sizeof(int), 2594 .maxlen = sizeof(int),
2595 .mode = 0644, 2595 .mode = 0644,
2596 .proc_handler = &proc_dointvec_jiffies, 2596 .proc_handler = proc_dointvec_jiffies,
2597 .strategy = &sysctl_jiffies, 2597 .strategy = sysctl_jiffies,
2598 }, 2598 },
2599 { 2599 {
2600 .ctl_name = NET_NEIGH_DELAY_PROBE_TIME, 2600 .ctl_name = NET_NEIGH_DELAY_PROBE_TIME,
2601 .procname = "delay_first_probe_time", 2601 .procname = "delay_first_probe_time",
2602 .maxlen = sizeof(int), 2602 .maxlen = sizeof(int),
2603 .mode = 0644, 2603 .mode = 0644,
2604 .proc_handler = &proc_dointvec_jiffies, 2604 .proc_handler = proc_dointvec_jiffies,
2605 .strategy = &sysctl_jiffies, 2605 .strategy = sysctl_jiffies,
2606 }, 2606 },
2607 { 2607 {
2608 .ctl_name = NET_NEIGH_GC_STALE_TIME, 2608 .ctl_name = NET_NEIGH_GC_STALE_TIME,
2609 .procname = "gc_stale_time", 2609 .procname = "gc_stale_time",
2610 .maxlen = sizeof(int), 2610 .maxlen = sizeof(int),
2611 .mode = 0644, 2611 .mode = 0644,
2612 .proc_handler = &proc_dointvec_jiffies, 2612 .proc_handler = proc_dointvec_jiffies,
2613 .strategy = &sysctl_jiffies, 2613 .strategy = sysctl_jiffies,
2614 }, 2614 },
2615 { 2615 {
2616 .ctl_name = NET_NEIGH_UNRES_QLEN, 2616 .ctl_name = NET_NEIGH_UNRES_QLEN,
2617 .procname = "unres_qlen", 2617 .procname = "unres_qlen",
2618 .maxlen = sizeof(int), 2618 .maxlen = sizeof(int),
2619 .mode = 0644, 2619 .mode = 0644,
2620 .proc_handler = &proc_dointvec, 2620 .proc_handler = proc_dointvec,
2621 }, 2621 },
2622 { 2622 {
2623 .ctl_name = NET_NEIGH_PROXY_QLEN, 2623 .ctl_name = NET_NEIGH_PROXY_QLEN,
2624 .procname = "proxy_qlen", 2624 .procname = "proxy_qlen",
2625 .maxlen = sizeof(int), 2625 .maxlen = sizeof(int),
2626 .mode = 0644, 2626 .mode = 0644,
2627 .proc_handler = &proc_dointvec, 2627 .proc_handler = proc_dointvec,
2628 }, 2628 },
2629 { 2629 {
2630 .procname = "anycast_delay", 2630 .procname = "anycast_delay",
2631 .maxlen = sizeof(int), 2631 .maxlen = sizeof(int),
2632 .mode = 0644, 2632 .mode = 0644,
2633 .proc_handler = &proc_dointvec_userhz_jiffies, 2633 .proc_handler = proc_dointvec_userhz_jiffies,
2634 }, 2634 },
2635 { 2635 {
2636 .procname = "proxy_delay", 2636 .procname = "proxy_delay",
2637 .maxlen = sizeof(int), 2637 .maxlen = sizeof(int),
2638 .mode = 0644, 2638 .mode = 0644,
2639 .proc_handler = &proc_dointvec_userhz_jiffies, 2639 .proc_handler = proc_dointvec_userhz_jiffies,
2640 }, 2640 },
2641 { 2641 {
2642 .procname = "locktime", 2642 .procname = "locktime",
2643 .maxlen = sizeof(int), 2643 .maxlen = sizeof(int),
2644 .mode = 0644, 2644 .mode = 0644,
2645 .proc_handler = &proc_dointvec_userhz_jiffies, 2645 .proc_handler = proc_dointvec_userhz_jiffies,
2646 }, 2646 },
2647 { 2647 {
2648 .ctl_name = NET_NEIGH_RETRANS_TIME_MS, 2648 .ctl_name = NET_NEIGH_RETRANS_TIME_MS,
2649 .procname = "retrans_time_ms", 2649 .procname = "retrans_time_ms",
2650 .maxlen = sizeof(int), 2650 .maxlen = sizeof(int),
2651 .mode = 0644, 2651 .mode = 0644,
2652 .proc_handler = &proc_dointvec_ms_jiffies, 2652 .proc_handler = proc_dointvec_ms_jiffies,
2653 .strategy = &sysctl_ms_jiffies, 2653 .strategy = sysctl_ms_jiffies,
2654 }, 2654 },
2655 { 2655 {
2656 .ctl_name = NET_NEIGH_REACHABLE_TIME_MS, 2656 .ctl_name = NET_NEIGH_REACHABLE_TIME_MS,
2657 .procname = "base_reachable_time_ms", 2657 .procname = "base_reachable_time_ms",
2658 .maxlen = sizeof(int), 2658 .maxlen = sizeof(int),
2659 .mode = 0644, 2659 .mode = 0644,
2660 .proc_handler = &proc_dointvec_ms_jiffies, 2660 .proc_handler = proc_dointvec_ms_jiffies,
2661 .strategy = &sysctl_ms_jiffies, 2661 .strategy = sysctl_ms_jiffies,
2662 }, 2662 },
2663 { 2663 {
2664 .ctl_name = NET_NEIGH_GC_INTERVAL, 2664 .ctl_name = NET_NEIGH_GC_INTERVAL,
2665 .procname = "gc_interval", 2665 .procname = "gc_interval",
2666 .maxlen = sizeof(int), 2666 .maxlen = sizeof(int),
2667 .mode = 0644, 2667 .mode = 0644,
2668 .proc_handler = &proc_dointvec_jiffies, 2668 .proc_handler = proc_dointvec_jiffies,
2669 .strategy = &sysctl_jiffies, 2669 .strategy = sysctl_jiffies,
2670 }, 2670 },
2671 { 2671 {
2672 .ctl_name = NET_NEIGH_GC_THRESH1, 2672 .ctl_name = NET_NEIGH_GC_THRESH1,
2673 .procname = "gc_thresh1", 2673 .procname = "gc_thresh1",
2674 .maxlen = sizeof(int), 2674 .maxlen = sizeof(int),
2675 .mode = 0644, 2675 .mode = 0644,
2676 .proc_handler = &proc_dointvec, 2676 .proc_handler = proc_dointvec,
2677 }, 2677 },
2678 { 2678 {
2679 .ctl_name = NET_NEIGH_GC_THRESH2, 2679 .ctl_name = NET_NEIGH_GC_THRESH2,
2680 .procname = "gc_thresh2", 2680 .procname = "gc_thresh2",
2681 .maxlen = sizeof(int), 2681 .maxlen = sizeof(int),
2682 .mode = 0644, 2682 .mode = 0644,
2683 .proc_handler = &proc_dointvec, 2683 .proc_handler = proc_dointvec,
2684 }, 2684 },
2685 { 2685 {
2686 .ctl_name = NET_NEIGH_GC_THRESH3, 2686 .ctl_name = NET_NEIGH_GC_THRESH3,
2687 .procname = "gc_thresh3", 2687 .procname = "gc_thresh3",
2688 .maxlen = sizeof(int), 2688 .maxlen = sizeof(int),
2689 .mode = 0644, 2689 .mode = 0644,
2690 .proc_handler = &proc_dointvec, 2690 .proc_handler = proc_dointvec,
2691 }, 2691 },
2692 {}, 2692 {},
2693 }, 2693 },
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index f686467ff12b..2bc0384b0448 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -22,7 +22,7 @@ static struct ctl_table net_core_table[] = {
22 .data = &sysctl_wmem_max, 22 .data = &sysctl_wmem_max,
23 .maxlen = sizeof(int), 23 .maxlen = sizeof(int),
24 .mode = 0644, 24 .mode = 0644,
25 .proc_handler = &proc_dointvec 25 .proc_handler = proc_dointvec
26 }, 26 },
27 { 27 {
28 .ctl_name = NET_CORE_RMEM_MAX, 28 .ctl_name = NET_CORE_RMEM_MAX,
@@ -30,7 +30,7 @@ static struct ctl_table net_core_table[] = {
30 .data = &sysctl_rmem_max, 30 .data = &sysctl_rmem_max,
31 .maxlen = sizeof(int), 31 .maxlen = sizeof(int),
32 .mode = 0644, 32 .mode = 0644,
33 .proc_handler = &proc_dointvec 33 .proc_handler = proc_dointvec
34 }, 34 },
35 { 35 {
36 .ctl_name = NET_CORE_WMEM_DEFAULT, 36 .ctl_name = NET_CORE_WMEM_DEFAULT,
@@ -38,7 +38,7 @@ static struct ctl_table net_core_table[] = {
38 .data = &sysctl_wmem_default, 38 .data = &sysctl_wmem_default,
39 .maxlen = sizeof(int), 39 .maxlen = sizeof(int),
40 .mode = 0644, 40 .mode = 0644,
41 .proc_handler = &proc_dointvec 41 .proc_handler = proc_dointvec
42 }, 42 },
43 { 43 {
44 .ctl_name = NET_CORE_RMEM_DEFAULT, 44 .ctl_name = NET_CORE_RMEM_DEFAULT,
@@ -46,7 +46,7 @@ static struct ctl_table net_core_table[] = {
46 .data = &sysctl_rmem_default, 46 .data = &sysctl_rmem_default,
47 .maxlen = sizeof(int), 47 .maxlen = sizeof(int),
48 .mode = 0644, 48 .mode = 0644,
49 .proc_handler = &proc_dointvec 49 .proc_handler = proc_dointvec
50 }, 50 },
51 { 51 {
52 .ctl_name = NET_CORE_DEV_WEIGHT, 52 .ctl_name = NET_CORE_DEV_WEIGHT,
@@ -54,7 +54,7 @@ static struct ctl_table net_core_table[] = {
54 .data = &weight_p, 54 .data = &weight_p,
55 .maxlen = sizeof(int), 55 .maxlen = sizeof(int),
56 .mode = 0644, 56 .mode = 0644,
57 .proc_handler = &proc_dointvec 57 .proc_handler = proc_dointvec
58 }, 58 },
59 { 59 {
60 .ctl_name = NET_CORE_MAX_BACKLOG, 60 .ctl_name = NET_CORE_MAX_BACKLOG,
@@ -62,7 +62,7 @@ static struct ctl_table net_core_table[] = {
62 .data = &netdev_max_backlog, 62 .data = &netdev_max_backlog,
63 .maxlen = sizeof(int), 63 .maxlen = sizeof(int),
64 .mode = 0644, 64 .mode = 0644,
65 .proc_handler = &proc_dointvec 65 .proc_handler = proc_dointvec
66 }, 66 },
67 { 67 {
68 .ctl_name = NET_CORE_MSG_COST, 68 .ctl_name = NET_CORE_MSG_COST,
@@ -70,8 +70,8 @@ static struct ctl_table net_core_table[] = {
70 .data = &net_ratelimit_state.interval, 70 .data = &net_ratelimit_state.interval,
71 .maxlen = sizeof(int), 71 .maxlen = sizeof(int),
72 .mode = 0644, 72 .mode = 0644,
73 .proc_handler = &proc_dointvec_jiffies, 73 .proc_handler = proc_dointvec_jiffies,
74 .strategy = &sysctl_jiffies, 74 .strategy = sysctl_jiffies,
75 }, 75 },
76 { 76 {
77 .ctl_name = NET_CORE_MSG_BURST, 77 .ctl_name = NET_CORE_MSG_BURST,
@@ -79,7 +79,7 @@ static struct ctl_table net_core_table[] = {
79 .data = &net_ratelimit_state.burst, 79 .data = &net_ratelimit_state.burst,
80 .maxlen = sizeof(int), 80 .maxlen = sizeof(int),
81 .mode = 0644, 81 .mode = 0644,
82 .proc_handler = &proc_dointvec, 82 .proc_handler = proc_dointvec,
83 }, 83 },
84 { 84 {
85 .ctl_name = NET_CORE_OPTMEM_MAX, 85 .ctl_name = NET_CORE_OPTMEM_MAX,
@@ -87,7 +87,7 @@ static struct ctl_table net_core_table[] = {
87 .data = &sysctl_optmem_max, 87 .data = &sysctl_optmem_max,
88 .maxlen = sizeof(int), 88 .maxlen = sizeof(int),
89 .mode = 0644, 89 .mode = 0644,
90 .proc_handler = &proc_dointvec 90 .proc_handler = proc_dointvec
91 }, 91 },
92#ifdef CONFIG_XFRM 92#ifdef CONFIG_XFRM
93 { 93 {
@@ -96,7 +96,7 @@ static struct ctl_table net_core_table[] = {
96 .data = &sysctl_xfrm_aevent_etime, 96 .data = &sysctl_xfrm_aevent_etime,
97 .maxlen = sizeof(u32), 97 .maxlen = sizeof(u32),
98 .mode = 0644, 98 .mode = 0644,
99 .proc_handler = &proc_dointvec 99 .proc_handler = proc_dointvec
100 }, 100 },
101 { 101 {
102 .ctl_name = NET_CORE_AEVENT_RSEQTH, 102 .ctl_name = NET_CORE_AEVENT_RSEQTH,
@@ -104,7 +104,7 @@ static struct ctl_table net_core_table[] = {
104 .data = &sysctl_xfrm_aevent_rseqth, 104 .data = &sysctl_xfrm_aevent_rseqth,
105 .maxlen = sizeof(u32), 105 .maxlen = sizeof(u32),
106 .mode = 0644, 106 .mode = 0644,
107 .proc_handler = &proc_dointvec 107 .proc_handler = proc_dointvec
108 }, 108 },
109 { 109 {
110 .ctl_name = CTL_UNNUMBERED, 110 .ctl_name = CTL_UNNUMBERED,
@@ -112,7 +112,7 @@ static struct ctl_table net_core_table[] = {
112 .data = &sysctl_xfrm_larval_drop, 112 .data = &sysctl_xfrm_larval_drop,
113 .maxlen = sizeof(int), 113 .maxlen = sizeof(int),
114 .mode = 0644, 114 .mode = 0644,
115 .proc_handler = &proc_dointvec 115 .proc_handler = proc_dointvec
116 }, 116 },
117 { 117 {
118 .ctl_name = CTL_UNNUMBERED, 118 .ctl_name = CTL_UNNUMBERED,
@@ -120,7 +120,7 @@ static struct ctl_table net_core_table[] = {
120 .data = &sysctl_xfrm_acq_expires, 120 .data = &sysctl_xfrm_acq_expires,
121 .maxlen = sizeof(int), 121 .maxlen = sizeof(int),
122 .mode = 0644, 122 .mode = 0644,
123 .proc_handler = &proc_dointvec 123 .proc_handler = proc_dointvec
124 }, 124 },
125#endif /* CONFIG_XFRM */ 125#endif /* CONFIG_XFRM */
126#endif /* CONFIG_NET */ 126#endif /* CONFIG_NET */
@@ -130,7 +130,7 @@ static struct ctl_table net_core_table[] = {
130 .data = &netdev_budget, 130 .data = &netdev_budget,
131 .maxlen = sizeof(int), 131 .maxlen = sizeof(int),
132 .mode = 0644, 132 .mode = 0644,
133 .proc_handler = &proc_dointvec 133 .proc_handler = proc_dointvec
134 }, 134 },
135 { 135 {
136 .ctl_name = NET_CORE_WARNINGS, 136 .ctl_name = NET_CORE_WARNINGS,
@@ -138,7 +138,7 @@ static struct ctl_table net_core_table[] = {
138 .data = &net_msg_warn, 138 .data = &net_msg_warn,
139 .maxlen = sizeof(int), 139 .maxlen = sizeof(int),
140 .mode = 0644, 140 .mode = 0644,
141 .proc_handler = &proc_dointvec 141 .proc_handler = proc_dointvec
142 }, 142 },
143 { .ctl_name = 0 } 143 { .ctl_name = 0 }
144}; 144};
@@ -150,7 +150,7 @@ static struct ctl_table netns_core_table[] = {
150 .data = &init_net.core.sysctl_somaxconn, 150 .data = &init_net.core.sysctl_somaxconn,
151 .maxlen = sizeof(int), 151 .maxlen = sizeof(int),
152 .mode = 0644, 152 .mode = 0644,
153 .proc_handler = &proc_dointvec 153 .proc_handler = proc_dointvec
154 }, 154 },
155 { .ctl_name = 0 } 155 { .ctl_name = 0 }
156}; 156};
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index 36400b266896..2f360a1e5e49 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -354,8 +354,8 @@ static ctl_table dn_table[] = {
354 .data = node_name, 354 .data = node_name,
355 .maxlen = 7, 355 .maxlen = 7,
356 .mode = 0644, 356 .mode = 0644,
357 .proc_handler = &proc_dostring, 357 .proc_handler = proc_dostring,
358 .strategy = &sysctl_string, 358 .strategy = sysctl_string,
359 }, 359 },
360 { 360 {
361 .ctl_name = NET_DECNET_DEFAULT_DEVICE, 361 .ctl_name = NET_DECNET_DEFAULT_DEVICE,
@@ -371,8 +371,8 @@ static ctl_table dn_table[] = {
371 .data = &decnet_time_wait, 371 .data = &decnet_time_wait,
372 .maxlen = sizeof(int), 372 .maxlen = sizeof(int),
373 .mode = 0644, 373 .mode = 0644,
374 .proc_handler = &proc_dointvec_minmax, 374 .proc_handler = proc_dointvec_minmax,
375 .strategy = &sysctl_intvec, 375 .strategy = sysctl_intvec,
376 .extra1 = &min_decnet_time_wait, 376 .extra1 = &min_decnet_time_wait,
377 .extra2 = &max_decnet_time_wait 377 .extra2 = &max_decnet_time_wait
378 }, 378 },
@@ -382,8 +382,8 @@ static ctl_table dn_table[] = {
382 .data = &decnet_dn_count, 382 .data = &decnet_dn_count,
383 .maxlen = sizeof(int), 383 .maxlen = sizeof(int),
384 .mode = 0644, 384 .mode = 0644,
385 .proc_handler = &proc_dointvec_minmax, 385 .proc_handler = proc_dointvec_minmax,
386 .strategy = &sysctl_intvec, 386 .strategy = sysctl_intvec,
387 .extra1 = &min_state_count, 387 .extra1 = &min_state_count,
388 .extra2 = &max_state_count 388 .extra2 = &max_state_count
389 }, 389 },
@@ -393,8 +393,8 @@ static ctl_table dn_table[] = {
393 .data = &decnet_di_count, 393 .data = &decnet_di_count,
394 .maxlen = sizeof(int), 394 .maxlen = sizeof(int),
395 .mode = 0644, 395 .mode = 0644,
396 .proc_handler = &proc_dointvec_minmax, 396 .proc_handler = proc_dointvec_minmax,
397 .strategy = &sysctl_intvec, 397 .strategy = sysctl_intvec,
398 .extra1 = &min_state_count, 398 .extra1 = &min_state_count,
399 .extra2 = &max_state_count 399 .extra2 = &max_state_count
400 }, 400 },
@@ -404,8 +404,8 @@ static ctl_table dn_table[] = {
404 .data = &decnet_dr_count, 404 .data = &decnet_dr_count,
405 .maxlen = sizeof(int), 405 .maxlen = sizeof(int),
406 .mode = 0644, 406 .mode = 0644,
407 .proc_handler = &proc_dointvec_minmax, 407 .proc_handler = proc_dointvec_minmax,
408 .strategy = &sysctl_intvec, 408 .strategy = sysctl_intvec,
409 .extra1 = &min_state_count, 409 .extra1 = &min_state_count,
410 .extra2 = &max_state_count 410 .extra2 = &max_state_count
411 }, 411 },
@@ -415,8 +415,8 @@ static ctl_table dn_table[] = {
415 .data = &decnet_dst_gc_interval, 415 .data = &decnet_dst_gc_interval,
416 .maxlen = sizeof(int), 416 .maxlen = sizeof(int),
417 .mode = 0644, 417 .mode = 0644,
418 .proc_handler = &proc_dointvec_minmax, 418 .proc_handler = proc_dointvec_minmax,
419 .strategy = &sysctl_intvec, 419 .strategy = sysctl_intvec,
420 .extra1 = &min_decnet_dst_gc_interval, 420 .extra1 = &min_decnet_dst_gc_interval,
421 .extra2 = &max_decnet_dst_gc_interval 421 .extra2 = &max_decnet_dst_gc_interval
422 }, 422 },
@@ -426,8 +426,8 @@ static ctl_table dn_table[] = {
426 .data = &decnet_no_fc_max_cwnd, 426 .data = &decnet_no_fc_max_cwnd,
427 .maxlen = sizeof(int), 427 .maxlen = sizeof(int),
428 .mode = 0644, 428 .mode = 0644,
429 .proc_handler = &proc_dointvec_minmax, 429 .proc_handler = proc_dointvec_minmax,
430 .strategy = &sysctl_intvec, 430 .strategy = sysctl_intvec,
431 .extra1 = &min_decnet_no_fc_max_cwnd, 431 .extra1 = &min_decnet_no_fc_max_cwnd,
432 .extra2 = &max_decnet_no_fc_max_cwnd 432 .extra2 = &max_decnet_no_fc_max_cwnd
433 }, 433 },
@@ -437,8 +437,8 @@ static ctl_table dn_table[] = {
437 .data = &sysctl_decnet_mem, 437 .data = &sysctl_decnet_mem,
438 .maxlen = sizeof(sysctl_decnet_mem), 438 .maxlen = sizeof(sysctl_decnet_mem),
439 .mode = 0644, 439 .mode = 0644,
440 .proc_handler = &proc_dointvec, 440 .proc_handler = proc_dointvec,
441 .strategy = &sysctl_intvec, 441 .strategy = sysctl_intvec,
442 }, 442 },
443 { 443 {
444 .ctl_name = NET_DECNET_RMEM, 444 .ctl_name = NET_DECNET_RMEM,
@@ -446,8 +446,8 @@ static ctl_table dn_table[] = {
446 .data = &sysctl_decnet_rmem, 446 .data = &sysctl_decnet_rmem,
447 .maxlen = sizeof(sysctl_decnet_rmem), 447 .maxlen = sizeof(sysctl_decnet_rmem),
448 .mode = 0644, 448 .mode = 0644,
449 .proc_handler = &proc_dointvec, 449 .proc_handler = proc_dointvec,
450 .strategy = &sysctl_intvec, 450 .strategy = sysctl_intvec,
451 }, 451 },
452 { 452 {
453 .ctl_name = NET_DECNET_WMEM, 453 .ctl_name = NET_DECNET_WMEM,
@@ -455,8 +455,8 @@ static ctl_table dn_table[] = {
455 .data = &sysctl_decnet_wmem, 455 .data = &sysctl_decnet_wmem,
456 .maxlen = sizeof(sysctl_decnet_wmem), 456 .maxlen = sizeof(sysctl_decnet_wmem),
457 .mode = 0644, 457 .mode = 0644,
458 .proc_handler = &proc_dointvec, 458 .proc_handler = proc_dointvec,
459 .strategy = &sysctl_intvec, 459 .strategy = sysctl_intvec,
460 }, 460 },
461 { 461 {
462 .ctl_name = NET_DECNET_DEBUG_LEVEL, 462 .ctl_name = NET_DECNET_DEBUG_LEVEL,
@@ -464,8 +464,8 @@ static ctl_table dn_table[] = {
464 .data = &decnet_debug_level, 464 .data = &decnet_debug_level,
465 .maxlen = sizeof(int), 465 .maxlen = sizeof(int),
466 .mode = 0644, 466 .mode = 0644,
467 .proc_handler = &proc_dointvec, 467 .proc_handler = proc_dointvec,
468 .strategy = &sysctl_intvec, 468 .strategy = sysctl_intvec,
469 }, 469 },
470 {0} 470 {0}
471}; 471};
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 1a3c37b5e936..6659ac000eeb 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -607,7 +607,7 @@ static struct ctl_table ip4_frags_ns_ctl_table[] = {
607 .data = &init_net.ipv4.frags.high_thresh, 607 .data = &init_net.ipv4.frags.high_thresh,
608 .maxlen = sizeof(int), 608 .maxlen = sizeof(int),
609 .mode = 0644, 609 .mode = 0644,
610 .proc_handler = &proc_dointvec 610 .proc_handler = proc_dointvec
611 }, 611 },
612 { 612 {
613 .ctl_name = NET_IPV4_IPFRAG_LOW_THRESH, 613 .ctl_name = NET_IPV4_IPFRAG_LOW_THRESH,
@@ -615,7 +615,7 @@ static struct ctl_table ip4_frags_ns_ctl_table[] = {
615 .data = &init_net.ipv4.frags.low_thresh, 615 .data = &init_net.ipv4.frags.low_thresh,
616 .maxlen = sizeof(int), 616 .maxlen = sizeof(int),
617 .mode = 0644, 617 .mode = 0644,
618 .proc_handler = &proc_dointvec 618 .proc_handler = proc_dointvec
619 }, 619 },
620 { 620 {
621 .ctl_name = NET_IPV4_IPFRAG_TIME, 621 .ctl_name = NET_IPV4_IPFRAG_TIME,
@@ -623,8 +623,8 @@ static struct ctl_table ip4_frags_ns_ctl_table[] = {
623 .data = &init_net.ipv4.frags.timeout, 623 .data = &init_net.ipv4.frags.timeout,
624 .maxlen = sizeof(int), 624 .maxlen = sizeof(int),
625 .mode = 0644, 625 .mode = 0644,
626 .proc_handler = &proc_dointvec_jiffies, 626 .proc_handler = proc_dointvec_jiffies,
627 .strategy = &sysctl_jiffies 627 .strategy = sysctl_jiffies
628 }, 628 },
629 { } 629 { }
630}; 630};
@@ -636,15 +636,15 @@ static struct ctl_table ip4_frags_ctl_table[] = {
636 .data = &ip4_frags.secret_interval, 636 .data = &ip4_frags.secret_interval,
637 .maxlen = sizeof(int), 637 .maxlen = sizeof(int),
638 .mode = 0644, 638 .mode = 0644,
639 .proc_handler = &proc_dointvec_jiffies, 639 .proc_handler = proc_dointvec_jiffies,
640 .strategy = &sysctl_jiffies 640 .strategy = sysctl_jiffies
641 }, 641 },
642 { 642 {
643 .procname = "ipfrag_max_dist", 643 .procname = "ipfrag_max_dist",
644 .data = &sysctl_ipfrag_max_dist, 644 .data = &sysctl_ipfrag_max_dist,
645 .maxlen = sizeof(int), 645 .maxlen = sizeof(int),
646 .mode = 0644, 646 .mode = 0644,
647 .proc_handler = &proc_dointvec_minmax, 647 .proc_handler = proc_dointvec_minmax,
648 .extra1 = &zero 648 .extra1 = &zero
649 }, 649 },
650 { } 650 { }
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index bddadead6195..b2141e11575e 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -197,7 +197,7 @@ static ctl_table ip_ct_sysctl_table[] = {
197 .data = &nf_conntrack_max, 197 .data = &nf_conntrack_max,
198 .maxlen = sizeof(int), 198 .maxlen = sizeof(int),
199 .mode = 0644, 199 .mode = 0644,
200 .proc_handler = &proc_dointvec, 200 .proc_handler = proc_dointvec,
201 }, 201 },
202 { 202 {
203 .ctl_name = NET_IPV4_NF_CONNTRACK_COUNT, 203 .ctl_name = NET_IPV4_NF_CONNTRACK_COUNT,
@@ -205,7 +205,7 @@ static ctl_table ip_ct_sysctl_table[] = {
205 .data = &init_net.ct.count, 205 .data = &init_net.ct.count,
206 .maxlen = sizeof(int), 206 .maxlen = sizeof(int),
207 .mode = 0444, 207 .mode = 0444,
208 .proc_handler = &proc_dointvec, 208 .proc_handler = proc_dointvec,
209 }, 209 },
210 { 210 {
211 .ctl_name = NET_IPV4_NF_CONNTRACK_BUCKETS, 211 .ctl_name = NET_IPV4_NF_CONNTRACK_BUCKETS,
@@ -213,7 +213,7 @@ static ctl_table ip_ct_sysctl_table[] = {
213 .data = &nf_conntrack_htable_size, 213 .data = &nf_conntrack_htable_size,
214 .maxlen = sizeof(unsigned int), 214 .maxlen = sizeof(unsigned int),
215 .mode = 0444, 215 .mode = 0444,
216 .proc_handler = &proc_dointvec, 216 .proc_handler = proc_dointvec,
217 }, 217 },
218 { 218 {
219 .ctl_name = NET_IPV4_NF_CONNTRACK_CHECKSUM, 219 .ctl_name = NET_IPV4_NF_CONNTRACK_CHECKSUM,
@@ -221,7 +221,7 @@ static ctl_table ip_ct_sysctl_table[] = {
221 .data = &init_net.ct.sysctl_checksum, 221 .data = &init_net.ct.sysctl_checksum,
222 .maxlen = sizeof(int), 222 .maxlen = sizeof(int),
223 .mode = 0644, 223 .mode = 0644,
224 .proc_handler = &proc_dointvec, 224 .proc_handler = proc_dointvec,
225 }, 225 },
226 { 226 {
227 .ctl_name = NET_IPV4_NF_CONNTRACK_LOG_INVALID, 227 .ctl_name = NET_IPV4_NF_CONNTRACK_LOG_INVALID,
@@ -229,8 +229,8 @@ static ctl_table ip_ct_sysctl_table[] = {
229 .data = &init_net.ct.sysctl_log_invalid, 229 .data = &init_net.ct.sysctl_log_invalid,
230 .maxlen = sizeof(unsigned int), 230 .maxlen = sizeof(unsigned int),
231 .mode = 0644, 231 .mode = 0644,
232 .proc_handler = &proc_dointvec_minmax, 232 .proc_handler = proc_dointvec_minmax,
233 .strategy = &sysctl_intvec, 233 .strategy = sysctl_intvec,
234 .extra1 = &log_invalid_proto_min, 234 .extra1 = &log_invalid_proto_min,
235 .extra2 = &log_invalid_proto_max, 235 .extra2 = &log_invalid_proto_max,
236 }, 236 },
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
index 4e8879220222..1fd3ef7718b6 100644
--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@ -272,7 +272,7 @@ static struct ctl_table icmp_sysctl_table[] = {
272 .data = &nf_ct_icmp_timeout, 272 .data = &nf_ct_icmp_timeout,
273 .maxlen = sizeof(unsigned int), 273 .maxlen = sizeof(unsigned int),
274 .mode = 0644, 274 .mode = 0644,
275 .proc_handler = &proc_dointvec_jiffies, 275 .proc_handler = proc_dointvec_jiffies,
276 }, 276 },
277 { 277 {
278 .ctl_name = 0 278 .ctl_name = 0
@@ -285,7 +285,7 @@ static struct ctl_table icmp_compat_sysctl_table[] = {
285 .data = &nf_ct_icmp_timeout, 285 .data = &nf_ct_icmp_timeout,
286 .maxlen = sizeof(unsigned int), 286 .maxlen = sizeof(unsigned int),
287 .mode = 0644, 287 .mode = 0644,
288 .proc_handler = &proc_dointvec_jiffies, 288 .proc_handler = proc_dointvec_jiffies,
289 }, 289 },
290 { 290 {
291 .ctl_name = 0 291 .ctl_name = 0
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index f47b9db0db7f..0dc0c3826763 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3118,7 +3118,7 @@ static ctl_table ipv4_route_table[] = {
3118 .data = &ipv4_dst_ops.gc_thresh, 3118 .data = &ipv4_dst_ops.gc_thresh,
3119 .maxlen = sizeof(int), 3119 .maxlen = sizeof(int),
3120 .mode = 0644, 3120 .mode = 0644,
3121 .proc_handler = &proc_dointvec, 3121 .proc_handler = proc_dointvec,
3122 }, 3122 },
3123 { 3123 {
3124 .ctl_name = NET_IPV4_ROUTE_MAX_SIZE, 3124 .ctl_name = NET_IPV4_ROUTE_MAX_SIZE,
@@ -3126,7 +3126,7 @@ static ctl_table ipv4_route_table[] = {
3126 .data = &ip_rt_max_size, 3126 .data = &ip_rt_max_size,
3127 .maxlen = sizeof(int), 3127 .maxlen = sizeof(int),
3128 .mode = 0644, 3128 .mode = 0644,
3129 .proc_handler = &proc_dointvec, 3129 .proc_handler = proc_dointvec,
3130 }, 3130 },
3131 { 3131 {
3132 /* Deprecated. Use gc_min_interval_ms */ 3132 /* Deprecated. Use gc_min_interval_ms */
@@ -3136,8 +3136,8 @@ static ctl_table ipv4_route_table[] = {
3136 .data = &ip_rt_gc_min_interval, 3136 .data = &ip_rt_gc_min_interval,
3137 .maxlen = sizeof(int), 3137 .maxlen = sizeof(int),
3138 .mode = 0644, 3138 .mode = 0644,
3139 .proc_handler = &proc_dointvec_jiffies, 3139 .proc_handler = proc_dointvec_jiffies,
3140 .strategy = &sysctl_jiffies, 3140 .strategy = sysctl_jiffies,
3141 }, 3141 },
3142 { 3142 {
3143 .ctl_name = NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS, 3143 .ctl_name = NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS,
@@ -3145,8 +3145,8 @@ static ctl_table ipv4_route_table[] = {
3145 .data = &ip_rt_gc_min_interval, 3145 .data = &ip_rt_gc_min_interval,
3146 .maxlen = sizeof(int), 3146 .maxlen = sizeof(int),
3147 .mode = 0644, 3147 .mode = 0644,
3148 .proc_handler = &proc_dointvec_ms_jiffies, 3148 .proc_handler = proc_dointvec_ms_jiffies,
3149 .strategy = &sysctl_ms_jiffies, 3149 .strategy = sysctl_ms_jiffies,
3150 }, 3150 },
3151 { 3151 {
3152 .ctl_name = NET_IPV4_ROUTE_GC_TIMEOUT, 3152 .ctl_name = NET_IPV4_ROUTE_GC_TIMEOUT,
@@ -3154,8 +3154,8 @@ static ctl_table ipv4_route_table[] = {
3154 .data = &ip_rt_gc_timeout, 3154 .data = &ip_rt_gc_timeout,
3155 .maxlen = sizeof(int), 3155 .maxlen = sizeof(int),
3156 .mode = 0644, 3156 .mode = 0644,
3157 .proc_handler = &proc_dointvec_jiffies, 3157 .proc_handler = proc_dointvec_jiffies,
3158 .strategy = &sysctl_jiffies, 3158 .strategy = sysctl_jiffies,
3159 }, 3159 },
3160 { 3160 {
3161 .ctl_name = NET_IPV4_ROUTE_GC_INTERVAL, 3161 .ctl_name = NET_IPV4_ROUTE_GC_INTERVAL,
@@ -3163,8 +3163,8 @@ static ctl_table ipv4_route_table[] = {
3163 .data = &ip_rt_gc_interval, 3163 .data = &ip_rt_gc_interval,
3164 .maxlen = sizeof(int), 3164 .maxlen = sizeof(int),
3165 .mode = 0644, 3165 .mode = 0644,
3166 .proc_handler = &proc_dointvec_jiffies, 3166 .proc_handler = proc_dointvec_jiffies,
3167 .strategy = &sysctl_jiffies, 3167 .strategy = sysctl_jiffies,
3168 }, 3168 },
3169 { 3169 {
3170 .ctl_name = NET_IPV4_ROUTE_REDIRECT_LOAD, 3170 .ctl_name = NET_IPV4_ROUTE_REDIRECT_LOAD,
@@ -3172,7 +3172,7 @@ static ctl_table ipv4_route_table[] = {
3172 .data = &ip_rt_redirect_load, 3172 .data = &ip_rt_redirect_load,
3173 .maxlen = sizeof(int), 3173 .maxlen = sizeof(int),
3174 .mode = 0644, 3174 .mode = 0644,
3175 .proc_handler = &proc_dointvec, 3175 .proc_handler = proc_dointvec,
3176 }, 3176 },
3177 { 3177 {
3178 .ctl_name = NET_IPV4_ROUTE_REDIRECT_NUMBER, 3178 .ctl_name = NET_IPV4_ROUTE_REDIRECT_NUMBER,
@@ -3180,7 +3180,7 @@ static ctl_table ipv4_route_table[] = {
3180 .data = &ip_rt_redirect_number, 3180 .data = &ip_rt_redirect_number,
3181 .maxlen = sizeof(int), 3181 .maxlen = sizeof(int),
3182 .mode = 0644, 3182 .mode = 0644,
3183 .proc_handler = &proc_dointvec, 3183 .proc_handler = proc_dointvec,
3184 }, 3184 },
3185 { 3185 {
3186 .ctl_name = NET_IPV4_ROUTE_REDIRECT_SILENCE, 3186 .ctl_name = NET_IPV4_ROUTE_REDIRECT_SILENCE,
@@ -3188,7 +3188,7 @@ static ctl_table ipv4_route_table[] = {
3188 .data = &ip_rt_redirect_silence, 3188 .data = &ip_rt_redirect_silence,
3189 .maxlen = sizeof(int), 3189 .maxlen = sizeof(int),
3190 .mode = 0644, 3190 .mode = 0644,
3191 .proc_handler = &proc_dointvec, 3191 .proc_handler = proc_dointvec,
3192 }, 3192 },
3193 { 3193 {
3194 .ctl_name = NET_IPV4_ROUTE_ERROR_COST, 3194 .ctl_name = NET_IPV4_ROUTE_ERROR_COST,
@@ -3196,7 +3196,7 @@ static ctl_table ipv4_route_table[] = {
3196 .data = &ip_rt_error_cost, 3196 .data = &ip_rt_error_cost,
3197 .maxlen = sizeof(int), 3197 .maxlen = sizeof(int),
3198 .mode = 0644, 3198 .mode = 0644,
3199 .proc_handler = &proc_dointvec, 3199 .proc_handler = proc_dointvec,
3200 }, 3200 },
3201 { 3201 {
3202 .ctl_name = NET_IPV4_ROUTE_ERROR_BURST, 3202 .ctl_name = NET_IPV4_ROUTE_ERROR_BURST,
@@ -3204,7 +3204,7 @@ static ctl_table ipv4_route_table[] = {
3204 .data = &ip_rt_error_burst, 3204 .data = &ip_rt_error_burst,
3205 .maxlen = sizeof(int), 3205 .maxlen = sizeof(int),
3206 .mode = 0644, 3206 .mode = 0644,
3207 .proc_handler = &proc_dointvec, 3207 .proc_handler = proc_dointvec,
3208 }, 3208 },
3209 { 3209 {
3210 .ctl_name = NET_IPV4_ROUTE_GC_ELASTICITY, 3210 .ctl_name = NET_IPV4_ROUTE_GC_ELASTICITY,
@@ -3212,7 +3212,7 @@ static ctl_table ipv4_route_table[] = {
3212 .data = &ip_rt_gc_elasticity, 3212 .data = &ip_rt_gc_elasticity,
3213 .maxlen = sizeof(int), 3213 .maxlen = sizeof(int),
3214 .mode = 0644, 3214 .mode = 0644,
3215 .proc_handler = &proc_dointvec, 3215 .proc_handler = proc_dointvec,
3216 }, 3216 },
3217 { 3217 {
3218 .ctl_name = NET_IPV4_ROUTE_MTU_EXPIRES, 3218 .ctl_name = NET_IPV4_ROUTE_MTU_EXPIRES,
@@ -3220,8 +3220,8 @@ static ctl_table ipv4_route_table[] = {
3220 .data = &ip_rt_mtu_expires, 3220 .data = &ip_rt_mtu_expires,
3221 .maxlen = sizeof(int), 3221 .maxlen = sizeof(int),
3222 .mode = 0644, 3222 .mode = 0644,
3223 .proc_handler = &proc_dointvec_jiffies, 3223 .proc_handler = proc_dointvec_jiffies,
3224 .strategy = &sysctl_jiffies, 3224 .strategy = sysctl_jiffies,
3225 }, 3225 },
3226 { 3226 {
3227 .ctl_name = NET_IPV4_ROUTE_MIN_PMTU, 3227 .ctl_name = NET_IPV4_ROUTE_MIN_PMTU,
@@ -3229,7 +3229,7 @@ static ctl_table ipv4_route_table[] = {
3229 .data = &ip_rt_min_pmtu, 3229 .data = &ip_rt_min_pmtu,
3230 .maxlen = sizeof(int), 3230 .maxlen = sizeof(int),
3231 .mode = 0644, 3231 .mode = 0644,
3232 .proc_handler = &proc_dointvec, 3232 .proc_handler = proc_dointvec,
3233 }, 3233 },
3234 { 3234 {
3235 .ctl_name = NET_IPV4_ROUTE_MIN_ADVMSS, 3235 .ctl_name = NET_IPV4_ROUTE_MIN_ADVMSS,
@@ -3237,7 +3237,7 @@ static ctl_table ipv4_route_table[] = {
3237 .data = &ip_rt_min_advmss, 3237 .data = &ip_rt_min_advmss,
3238 .maxlen = sizeof(int), 3238 .maxlen = sizeof(int),
3239 .mode = 0644, 3239 .mode = 0644,
3240 .proc_handler = &proc_dointvec, 3240 .proc_handler = proc_dointvec,
3241 }, 3241 },
3242 { 3242 {
3243 .ctl_name = NET_IPV4_ROUTE_SECRET_INTERVAL, 3243 .ctl_name = NET_IPV4_ROUTE_SECRET_INTERVAL,
@@ -3245,8 +3245,8 @@ static ctl_table ipv4_route_table[] = {
3245 .data = &ip_rt_secret_interval, 3245 .data = &ip_rt_secret_interval,
3246 .maxlen = sizeof(int), 3246 .maxlen = sizeof(int),
3247 .mode = 0644, 3247 .mode = 0644,
3248 .proc_handler = &ipv4_sysctl_rt_secret_interval, 3248 .proc_handler = ipv4_sysctl_rt_secret_interval,
3249 .strategy = &ipv4_sysctl_rt_secret_interval_strategy, 3249 .strategy = ipv4_sysctl_rt_secret_interval_strategy,
3250 }, 3250 },
3251 { .ctl_name = 0 } 3251 { .ctl_name = 0 }
3252}; 3252};
@@ -3274,8 +3274,8 @@ static struct ctl_table ipv4_route_flush_table[] = {
3274 .procname = "flush", 3274 .procname = "flush",
3275 .maxlen = sizeof(int), 3275 .maxlen = sizeof(int),
3276 .mode = 0200, 3276 .mode = 0200,
3277 .proc_handler = &ipv4_sysctl_rtcache_flush, 3277 .proc_handler = ipv4_sysctl_rtcache_flush,
3278 .strategy = &ipv4_sysctl_rtcache_flush_strategy, 3278 .strategy = ipv4_sysctl_rtcache_flush_strategy,
3279 }, 3279 },
3280 { .ctl_name = 0 }, 3280 { .ctl_name = 0 },
3281}; 3281};
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 0cc8d31f9ac0..4710d219f06a 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -195,7 +195,7 @@ static struct ctl_table ipv4_table[] = {
195 .data = &sysctl_tcp_timestamps, 195 .data = &sysctl_tcp_timestamps,
196 .maxlen = sizeof(int), 196 .maxlen = sizeof(int),
197 .mode = 0644, 197 .mode = 0644,
198 .proc_handler = &proc_dointvec 198 .proc_handler = proc_dointvec
199 }, 199 },
200 { 200 {
201 .ctl_name = NET_IPV4_TCP_WINDOW_SCALING, 201 .ctl_name = NET_IPV4_TCP_WINDOW_SCALING,
@@ -203,7 +203,7 @@ static struct ctl_table ipv4_table[] = {
203 .data = &sysctl_tcp_window_scaling, 203 .data = &sysctl_tcp_window_scaling,
204 .maxlen = sizeof(int), 204 .maxlen = sizeof(int),
205 .mode = 0644, 205 .mode = 0644,
206 .proc_handler = &proc_dointvec 206 .proc_handler = proc_dointvec
207 }, 207 },
208 { 208 {
209 .ctl_name = NET_IPV4_TCP_SACK, 209 .ctl_name = NET_IPV4_TCP_SACK,
@@ -211,7 +211,7 @@ static struct ctl_table ipv4_table[] = {
211 .data = &sysctl_tcp_sack, 211 .data = &sysctl_tcp_sack,
212 .maxlen = sizeof(int), 212 .maxlen = sizeof(int),
213 .mode = 0644, 213 .mode = 0644,
214 .proc_handler = &proc_dointvec 214 .proc_handler = proc_dointvec
215 }, 215 },
216 { 216 {
217 .ctl_name = NET_IPV4_TCP_RETRANS_COLLAPSE, 217 .ctl_name = NET_IPV4_TCP_RETRANS_COLLAPSE,
@@ -219,7 +219,7 @@ static struct ctl_table ipv4_table[] = {
219 .data = &sysctl_tcp_retrans_collapse, 219 .data = &sysctl_tcp_retrans_collapse,
220 .maxlen = sizeof(int), 220 .maxlen = sizeof(int),
221 .mode = 0644, 221 .mode = 0644,
222 .proc_handler = &proc_dointvec 222 .proc_handler = proc_dointvec
223 }, 223 },
224 { 224 {
225 .ctl_name = NET_IPV4_DEFAULT_TTL, 225 .ctl_name = NET_IPV4_DEFAULT_TTL,
@@ -227,8 +227,8 @@ static struct ctl_table ipv4_table[] = {
227 .data = &sysctl_ip_default_ttl, 227 .data = &sysctl_ip_default_ttl,
228 .maxlen = sizeof(int), 228 .maxlen = sizeof(int),
229 .mode = 0644, 229 .mode = 0644,
230 .proc_handler = &ipv4_doint_and_flush, 230 .proc_handler = ipv4_doint_and_flush,
231 .strategy = &ipv4_doint_and_flush_strategy, 231 .strategy = ipv4_doint_and_flush_strategy,
232 .extra2 = &init_net, 232 .extra2 = &init_net,
233 }, 233 },
234 { 234 {
@@ -237,7 +237,7 @@ static struct ctl_table ipv4_table[] = {
237 .data = &ipv4_config.no_pmtu_disc, 237 .data = &ipv4_config.no_pmtu_disc,
238 .maxlen = sizeof(int), 238 .maxlen = sizeof(int),
239 .mode = 0644, 239 .mode = 0644,
240 .proc_handler = &proc_dointvec 240 .proc_handler = proc_dointvec
241 }, 241 },
242 { 242 {
243 .ctl_name = NET_IPV4_NONLOCAL_BIND, 243 .ctl_name = NET_IPV4_NONLOCAL_BIND,
@@ -245,7 +245,7 @@ static struct ctl_table ipv4_table[] = {
245 .data = &sysctl_ip_nonlocal_bind, 245 .data = &sysctl_ip_nonlocal_bind,
246 .maxlen = sizeof(int), 246 .maxlen = sizeof(int),
247 .mode = 0644, 247 .mode = 0644,
248 .proc_handler = &proc_dointvec 248 .proc_handler = proc_dointvec
249 }, 249 },
250 { 250 {
251 .ctl_name = NET_IPV4_TCP_SYN_RETRIES, 251 .ctl_name = NET_IPV4_TCP_SYN_RETRIES,
@@ -253,7 +253,7 @@ static struct ctl_table ipv4_table[] = {
253 .data = &sysctl_tcp_syn_retries, 253 .data = &sysctl_tcp_syn_retries,
254 .maxlen = sizeof(int), 254 .maxlen = sizeof(int),
255 .mode = 0644, 255 .mode = 0644,
256 .proc_handler = &proc_dointvec 256 .proc_handler = proc_dointvec
257 }, 257 },
258 { 258 {
259 .ctl_name = NET_TCP_SYNACK_RETRIES, 259 .ctl_name = NET_TCP_SYNACK_RETRIES,
@@ -261,7 +261,7 @@ static struct ctl_table ipv4_table[] = {
261 .data = &sysctl_tcp_synack_retries, 261 .data = &sysctl_tcp_synack_retries,
262 .maxlen = sizeof(int), 262 .maxlen = sizeof(int),
263 .mode = 0644, 263 .mode = 0644,
264 .proc_handler = &proc_dointvec 264 .proc_handler = proc_dointvec
265 }, 265 },
266 { 266 {
267 .ctl_name = NET_TCP_MAX_ORPHANS, 267 .ctl_name = NET_TCP_MAX_ORPHANS,
@@ -269,7 +269,7 @@ static struct ctl_table ipv4_table[] = {
269 .data = &sysctl_tcp_max_orphans, 269 .data = &sysctl_tcp_max_orphans,
270 .maxlen = sizeof(int), 270 .maxlen = sizeof(int),
271 .mode = 0644, 271 .mode = 0644,
272 .proc_handler = &proc_dointvec 272 .proc_handler = proc_dointvec
273 }, 273 },
274 { 274 {
275 .ctl_name = NET_TCP_MAX_TW_BUCKETS, 275 .ctl_name = NET_TCP_MAX_TW_BUCKETS,
@@ -277,7 +277,7 @@ static struct ctl_table ipv4_table[] = {
277 .data = &tcp_death_row.sysctl_max_tw_buckets, 277 .data = &tcp_death_row.sysctl_max_tw_buckets,
278 .maxlen = sizeof(int), 278 .maxlen = sizeof(int),
279 .mode = 0644, 279 .mode = 0644,
280 .proc_handler = &proc_dointvec 280 .proc_handler = proc_dointvec
281 }, 281 },
282 { 282 {
283 .ctl_name = NET_IPV4_DYNADDR, 283 .ctl_name = NET_IPV4_DYNADDR,
@@ -285,7 +285,7 @@ static struct ctl_table ipv4_table[] = {
285 .data = &sysctl_ip_dynaddr, 285 .data = &sysctl_ip_dynaddr,
286 .maxlen = sizeof(int), 286 .maxlen = sizeof(int),
287 .mode = 0644, 287 .mode = 0644,
288 .proc_handler = &proc_dointvec 288 .proc_handler = proc_dointvec
289 }, 289 },
290 { 290 {
291 .ctl_name = NET_IPV4_TCP_KEEPALIVE_TIME, 291 .ctl_name = NET_IPV4_TCP_KEEPALIVE_TIME,
@@ -293,8 +293,8 @@ static struct ctl_table ipv4_table[] = {
293 .data = &sysctl_tcp_keepalive_time, 293 .data = &sysctl_tcp_keepalive_time,
294 .maxlen = sizeof(int), 294 .maxlen = sizeof(int),
295 .mode = 0644, 295 .mode = 0644,
296 .proc_handler = &proc_dointvec_jiffies, 296 .proc_handler = proc_dointvec_jiffies,
297 .strategy = &sysctl_jiffies 297 .strategy = sysctl_jiffies
298 }, 298 },
299 { 299 {
300 .ctl_name = NET_IPV4_TCP_KEEPALIVE_PROBES, 300 .ctl_name = NET_IPV4_TCP_KEEPALIVE_PROBES,
@@ -302,7 +302,7 @@ static struct ctl_table ipv4_table[] = {
302 .data = &sysctl_tcp_keepalive_probes, 302 .data = &sysctl_tcp_keepalive_probes,
303 .maxlen = sizeof(int), 303 .maxlen = sizeof(int),
304 .mode = 0644, 304 .mode = 0644,
305 .proc_handler = &proc_dointvec 305 .proc_handler = proc_dointvec
306 }, 306 },
307 { 307 {
308 .ctl_name = NET_IPV4_TCP_KEEPALIVE_INTVL, 308 .ctl_name = NET_IPV4_TCP_KEEPALIVE_INTVL,
@@ -310,8 +310,8 @@ static struct ctl_table ipv4_table[] = {
310 .data = &sysctl_tcp_keepalive_intvl, 310 .data = &sysctl_tcp_keepalive_intvl,
311 .maxlen = sizeof(int), 311 .maxlen = sizeof(int),
312 .mode = 0644, 312 .mode = 0644,
313 .proc_handler = &proc_dointvec_jiffies, 313 .proc_handler = proc_dointvec_jiffies,
314 .strategy = &sysctl_jiffies 314 .strategy = sysctl_jiffies
315 }, 315 },
316 { 316 {
317 .ctl_name = NET_IPV4_TCP_RETRIES1, 317 .ctl_name = NET_IPV4_TCP_RETRIES1,
@@ -319,8 +319,8 @@ static struct ctl_table ipv4_table[] = {
319 .data = &sysctl_tcp_retries1, 319 .data = &sysctl_tcp_retries1,
320 .maxlen = sizeof(int), 320 .maxlen = sizeof(int),
321 .mode = 0644, 321 .mode = 0644,
322 .proc_handler = &proc_dointvec_minmax, 322 .proc_handler = proc_dointvec_minmax,
323 .strategy = &sysctl_intvec, 323 .strategy = sysctl_intvec,
324 .extra2 = &tcp_retr1_max 324 .extra2 = &tcp_retr1_max
325 }, 325 },
326 { 326 {
@@ -329,7 +329,7 @@ static struct ctl_table ipv4_table[] = {
329 .data = &sysctl_tcp_retries2, 329 .data = &sysctl_tcp_retries2,
330 .maxlen = sizeof(int), 330 .maxlen = sizeof(int),
331 .mode = 0644, 331 .mode = 0644,
332 .proc_handler = &proc_dointvec 332 .proc_handler = proc_dointvec
333 }, 333 },
334 { 334 {
335 .ctl_name = NET_IPV4_TCP_FIN_TIMEOUT, 335 .ctl_name = NET_IPV4_TCP_FIN_TIMEOUT,
@@ -337,8 +337,8 @@ static struct ctl_table ipv4_table[] = {
337 .data = &sysctl_tcp_fin_timeout, 337 .data = &sysctl_tcp_fin_timeout,
338 .maxlen = sizeof(int), 338 .maxlen = sizeof(int),
339 .mode = 0644, 339 .mode = 0644,
340 .proc_handler = &proc_dointvec_jiffies, 340 .proc_handler = proc_dointvec_jiffies,
341 .strategy = &sysctl_jiffies 341 .strategy = sysctl_jiffies
342 }, 342 },
343#ifdef CONFIG_SYN_COOKIES 343#ifdef CONFIG_SYN_COOKIES
344 { 344 {
@@ -347,7 +347,7 @@ static struct ctl_table ipv4_table[] = {
347 .data = &sysctl_tcp_syncookies, 347 .data = &sysctl_tcp_syncookies,
348 .maxlen = sizeof(int), 348 .maxlen = sizeof(int),
349 .mode = 0644, 349 .mode = 0644,
350 .proc_handler = &proc_dointvec 350 .proc_handler = proc_dointvec
351 }, 351 },
352#endif 352#endif
353 { 353 {
@@ -356,7 +356,7 @@ static struct ctl_table ipv4_table[] = {
356 .data = &tcp_death_row.sysctl_tw_recycle, 356 .data = &tcp_death_row.sysctl_tw_recycle,
357 .maxlen = sizeof(int), 357 .maxlen = sizeof(int),
358 .mode = 0644, 358 .mode = 0644,
359 .proc_handler = &proc_dointvec 359 .proc_handler = proc_dointvec
360 }, 360 },
361 { 361 {
362 .ctl_name = NET_TCP_ABORT_ON_OVERFLOW, 362 .ctl_name = NET_TCP_ABORT_ON_OVERFLOW,
@@ -364,7 +364,7 @@ static struct ctl_table ipv4_table[] = {
364 .data = &sysctl_tcp_abort_on_overflow, 364 .data = &sysctl_tcp_abort_on_overflow,
365 .maxlen = sizeof(int), 365 .maxlen = sizeof(int),
366 .mode = 0644, 366 .mode = 0644,
367 .proc_handler = &proc_dointvec 367 .proc_handler = proc_dointvec
368 }, 368 },
369 { 369 {
370 .ctl_name = NET_TCP_STDURG, 370 .ctl_name = NET_TCP_STDURG,
@@ -372,7 +372,7 @@ static struct ctl_table ipv4_table[] = {
372 .data = &sysctl_tcp_stdurg, 372 .data = &sysctl_tcp_stdurg,
373 .maxlen = sizeof(int), 373 .maxlen = sizeof(int),
374 .mode = 0644, 374 .mode = 0644,
375 .proc_handler = &proc_dointvec 375 .proc_handler = proc_dointvec
376 }, 376 },
377 { 377 {
378 .ctl_name = NET_TCP_RFC1337, 378 .ctl_name = NET_TCP_RFC1337,
@@ -380,7 +380,7 @@ static struct ctl_table ipv4_table[] = {
380 .data = &sysctl_tcp_rfc1337, 380 .data = &sysctl_tcp_rfc1337,
381 .maxlen = sizeof(int), 381 .maxlen = sizeof(int),
382 .mode = 0644, 382 .mode = 0644,
383 .proc_handler = &proc_dointvec 383 .proc_handler = proc_dointvec
384 }, 384 },
385 { 385 {
386 .ctl_name = NET_TCP_MAX_SYN_BACKLOG, 386 .ctl_name = NET_TCP_MAX_SYN_BACKLOG,
@@ -388,7 +388,7 @@ static struct ctl_table ipv4_table[] = {
388 .data = &sysctl_max_syn_backlog, 388 .data = &sysctl_max_syn_backlog,
389 .maxlen = sizeof(int), 389 .maxlen = sizeof(int),
390 .mode = 0644, 390 .mode = 0644,
391 .proc_handler = &proc_dointvec 391 .proc_handler = proc_dointvec
392 }, 392 },
393 { 393 {
394 .ctl_name = NET_IPV4_LOCAL_PORT_RANGE, 394 .ctl_name = NET_IPV4_LOCAL_PORT_RANGE,
@@ -396,8 +396,8 @@ static struct ctl_table ipv4_table[] = {
396 .data = &sysctl_local_ports.range, 396 .data = &sysctl_local_ports.range,
397 .maxlen = sizeof(sysctl_local_ports.range), 397 .maxlen = sizeof(sysctl_local_ports.range),
398 .mode = 0644, 398 .mode = 0644,
399 .proc_handler = &ipv4_local_port_range, 399 .proc_handler = ipv4_local_port_range,
400 .strategy = &ipv4_sysctl_local_port_range, 400 .strategy = ipv4_sysctl_local_port_range,
401 }, 401 },
402#ifdef CONFIG_IP_MULTICAST 402#ifdef CONFIG_IP_MULTICAST
403 { 403 {
@@ -406,7 +406,7 @@ static struct ctl_table ipv4_table[] = {
406 .data = &sysctl_igmp_max_memberships, 406 .data = &sysctl_igmp_max_memberships,
407 .maxlen = sizeof(int), 407 .maxlen = sizeof(int),
408 .mode = 0644, 408 .mode = 0644,
409 .proc_handler = &proc_dointvec 409 .proc_handler = proc_dointvec
410 }, 410 },
411 411
412#endif 412#endif
@@ -416,7 +416,7 @@ static struct ctl_table ipv4_table[] = {
416 .data = &sysctl_igmp_max_msf, 416 .data = &sysctl_igmp_max_msf,
417 .maxlen = sizeof(int), 417 .maxlen = sizeof(int),
418 .mode = 0644, 418 .mode = 0644,
419 .proc_handler = &proc_dointvec 419 .proc_handler = proc_dointvec
420 }, 420 },
421 { 421 {
422 .ctl_name = NET_IPV4_INET_PEER_THRESHOLD, 422 .ctl_name = NET_IPV4_INET_PEER_THRESHOLD,
@@ -424,7 +424,7 @@ static struct ctl_table ipv4_table[] = {
424 .data = &inet_peer_threshold, 424 .data = &inet_peer_threshold,
425 .maxlen = sizeof(int), 425 .maxlen = sizeof(int),
426 .mode = 0644, 426 .mode = 0644,
427 .proc_handler = &proc_dointvec 427 .proc_handler = proc_dointvec
428 }, 428 },
429 { 429 {
430 .ctl_name = NET_IPV4_INET_PEER_MINTTL, 430 .ctl_name = NET_IPV4_INET_PEER_MINTTL,
@@ -432,8 +432,8 @@ static struct ctl_table ipv4_table[] = {
432 .data = &inet_peer_minttl, 432 .data = &inet_peer_minttl,
433 .maxlen = sizeof(int), 433 .maxlen = sizeof(int),
434 .mode = 0644, 434 .mode = 0644,
435 .proc_handler = &proc_dointvec_jiffies, 435 .proc_handler = proc_dointvec_jiffies,
436 .strategy = &sysctl_jiffies 436 .strategy = sysctl_jiffies
437 }, 437 },
438 { 438 {
439 .ctl_name = NET_IPV4_INET_PEER_MAXTTL, 439 .ctl_name = NET_IPV4_INET_PEER_MAXTTL,
@@ -441,8 +441,8 @@ static struct ctl_table ipv4_table[] = {
441 .data = &inet_peer_maxttl, 441 .data = &inet_peer_maxttl,
442 .maxlen = sizeof(int), 442 .maxlen = sizeof(int),
443 .mode = 0644, 443 .mode = 0644,
444 .proc_handler = &proc_dointvec_jiffies, 444 .proc_handler = proc_dointvec_jiffies,
445 .strategy = &sysctl_jiffies 445 .strategy = sysctl_jiffies
446 }, 446 },
447 { 447 {
448 .ctl_name = NET_IPV4_INET_PEER_GC_MINTIME, 448 .ctl_name = NET_IPV4_INET_PEER_GC_MINTIME,
@@ -450,8 +450,8 @@ static struct ctl_table ipv4_table[] = {
450 .data = &inet_peer_gc_mintime, 450 .data = &inet_peer_gc_mintime,
451 .maxlen = sizeof(int), 451 .maxlen = sizeof(int),
452 .mode = 0644, 452 .mode = 0644,
453 .proc_handler = &proc_dointvec_jiffies, 453 .proc_handler = proc_dointvec_jiffies,
454 .strategy = &sysctl_jiffies 454 .strategy = sysctl_jiffies
455 }, 455 },
456 { 456 {
457 .ctl_name = NET_IPV4_INET_PEER_GC_MAXTIME, 457 .ctl_name = NET_IPV4_INET_PEER_GC_MAXTIME,
@@ -459,8 +459,8 @@ static struct ctl_table ipv4_table[] = {
459 .data = &inet_peer_gc_maxtime, 459 .data = &inet_peer_gc_maxtime,
460 .maxlen = sizeof(int), 460 .maxlen = sizeof(int),
461 .mode = 0644, 461 .mode = 0644,
462 .proc_handler = &proc_dointvec_jiffies, 462 .proc_handler = proc_dointvec_jiffies,
463 .strategy = &sysctl_jiffies 463 .strategy = sysctl_jiffies
464 }, 464 },
465 { 465 {
466 .ctl_name = NET_TCP_ORPHAN_RETRIES, 466 .ctl_name = NET_TCP_ORPHAN_RETRIES,
@@ -468,7 +468,7 @@ static struct ctl_table ipv4_table[] = {
468 .data = &sysctl_tcp_orphan_retries, 468 .data = &sysctl_tcp_orphan_retries,
469 .maxlen = sizeof(int), 469 .maxlen = sizeof(int),
470 .mode = 0644, 470 .mode = 0644,
471 .proc_handler = &proc_dointvec 471 .proc_handler = proc_dointvec
472 }, 472 },
473 { 473 {
474 .ctl_name = NET_TCP_FACK, 474 .ctl_name = NET_TCP_FACK,
@@ -476,7 +476,7 @@ static struct ctl_table ipv4_table[] = {
476 .data = &sysctl_tcp_fack, 476 .data = &sysctl_tcp_fack,
477 .maxlen = sizeof(int), 477 .maxlen = sizeof(int),
478 .mode = 0644, 478 .mode = 0644,
479 .proc_handler = &proc_dointvec 479 .proc_handler = proc_dointvec
480 }, 480 },
481 { 481 {
482 .ctl_name = NET_TCP_REORDERING, 482 .ctl_name = NET_TCP_REORDERING,
@@ -484,7 +484,7 @@ static struct ctl_table ipv4_table[] = {
484 .data = &sysctl_tcp_reordering, 484 .data = &sysctl_tcp_reordering,
485 .maxlen = sizeof(int), 485 .maxlen = sizeof(int),
486 .mode = 0644, 486 .mode = 0644,
487 .proc_handler = &proc_dointvec 487 .proc_handler = proc_dointvec
488 }, 488 },
489 { 489 {
490 .ctl_name = NET_TCP_ECN, 490 .ctl_name = NET_TCP_ECN,
@@ -492,7 +492,7 @@ static struct ctl_table ipv4_table[] = {
492 .data = &sysctl_tcp_ecn, 492 .data = &sysctl_tcp_ecn,
493 .maxlen = sizeof(int), 493 .maxlen = sizeof(int),
494 .mode = 0644, 494 .mode = 0644,
495 .proc_handler = &proc_dointvec 495 .proc_handler = proc_dointvec
496 }, 496 },
497 { 497 {
498 .ctl_name = NET_TCP_DSACK, 498 .ctl_name = NET_TCP_DSACK,
@@ -500,7 +500,7 @@ static struct ctl_table ipv4_table[] = {
500 .data = &sysctl_tcp_dsack, 500 .data = &sysctl_tcp_dsack,
501 .maxlen = sizeof(int), 501 .maxlen = sizeof(int),
502 .mode = 0644, 502 .mode = 0644,
503 .proc_handler = &proc_dointvec 503 .proc_handler = proc_dointvec
504 }, 504 },
505 { 505 {
506 .ctl_name = NET_TCP_MEM, 506 .ctl_name = NET_TCP_MEM,
@@ -508,7 +508,7 @@ static struct ctl_table ipv4_table[] = {
508 .data = &sysctl_tcp_mem, 508 .data = &sysctl_tcp_mem,
509 .maxlen = sizeof(sysctl_tcp_mem), 509 .maxlen = sizeof(sysctl_tcp_mem),
510 .mode = 0644, 510 .mode = 0644,
511 .proc_handler = &proc_dointvec 511 .proc_handler = proc_dointvec
512 }, 512 },
513 { 513 {
514 .ctl_name = NET_TCP_WMEM, 514 .ctl_name = NET_TCP_WMEM,
@@ -516,7 +516,7 @@ static struct ctl_table ipv4_table[] = {
516 .data = &sysctl_tcp_wmem, 516 .data = &sysctl_tcp_wmem,
517 .maxlen = sizeof(sysctl_tcp_wmem), 517 .maxlen = sizeof(sysctl_tcp_wmem),
518 .mode = 0644, 518 .mode = 0644,
519 .proc_handler = &proc_dointvec 519 .proc_handler = proc_dointvec
520 }, 520 },
521 { 521 {
522 .ctl_name = NET_TCP_RMEM, 522 .ctl_name = NET_TCP_RMEM,
@@ -524,7 +524,7 @@ static struct ctl_table ipv4_table[] = {
524 .data = &sysctl_tcp_rmem, 524 .data = &sysctl_tcp_rmem,
525 .maxlen = sizeof(sysctl_tcp_rmem), 525 .maxlen = sizeof(sysctl_tcp_rmem),
526 .mode = 0644, 526 .mode = 0644,
527 .proc_handler = &proc_dointvec 527 .proc_handler = proc_dointvec
528 }, 528 },
529 { 529 {
530 .ctl_name = NET_TCP_APP_WIN, 530 .ctl_name = NET_TCP_APP_WIN,
@@ -532,7 +532,7 @@ static struct ctl_table ipv4_table[] = {
532 .data = &sysctl_tcp_app_win, 532 .data = &sysctl_tcp_app_win,
533 .maxlen = sizeof(int), 533 .maxlen = sizeof(int),
534 .mode = 0644, 534 .mode = 0644,
535 .proc_handler = &proc_dointvec 535 .proc_handler = proc_dointvec
536 }, 536 },
537 { 537 {
538 .ctl_name = NET_TCP_ADV_WIN_SCALE, 538 .ctl_name = NET_TCP_ADV_WIN_SCALE,
@@ -540,7 +540,7 @@ static struct ctl_table ipv4_table[] = {
540 .data = &sysctl_tcp_adv_win_scale, 540 .data = &sysctl_tcp_adv_win_scale,
541 .maxlen = sizeof(int), 541 .maxlen = sizeof(int),
542 .mode = 0644, 542 .mode = 0644,
543 .proc_handler = &proc_dointvec 543 .proc_handler = proc_dointvec
544 }, 544 },
545 { 545 {
546 .ctl_name = NET_TCP_TW_REUSE, 546 .ctl_name = NET_TCP_TW_REUSE,
@@ -548,7 +548,7 @@ static struct ctl_table ipv4_table[] = {
548 .data = &sysctl_tcp_tw_reuse, 548 .data = &sysctl_tcp_tw_reuse,
549 .maxlen = sizeof(int), 549 .maxlen = sizeof(int),
550 .mode = 0644, 550 .mode = 0644,
551 .proc_handler = &proc_dointvec 551 .proc_handler = proc_dointvec
552 }, 552 },
553 { 553 {
554 .ctl_name = NET_TCP_FRTO, 554 .ctl_name = NET_TCP_FRTO,
@@ -556,7 +556,7 @@ static struct ctl_table ipv4_table[] = {
556 .data = &sysctl_tcp_frto, 556 .data = &sysctl_tcp_frto,
557 .maxlen = sizeof(int), 557 .maxlen = sizeof(int),
558 .mode = 0644, 558 .mode = 0644,
559 .proc_handler = &proc_dointvec 559 .proc_handler = proc_dointvec
560 }, 560 },
561 { 561 {
562 .ctl_name = NET_TCP_FRTO_RESPONSE, 562 .ctl_name = NET_TCP_FRTO_RESPONSE,
@@ -564,7 +564,7 @@ static struct ctl_table ipv4_table[] = {
564 .data = &sysctl_tcp_frto_response, 564 .data = &sysctl_tcp_frto_response,
565 .maxlen = sizeof(int), 565 .maxlen = sizeof(int),
566 .mode = 0644, 566 .mode = 0644,
567 .proc_handler = &proc_dointvec 567 .proc_handler = proc_dointvec
568 }, 568 },
569 { 569 {
570 .ctl_name = NET_TCP_LOW_LATENCY, 570 .ctl_name = NET_TCP_LOW_LATENCY,
@@ -572,7 +572,7 @@ static struct ctl_table ipv4_table[] = {
572 .data = &sysctl_tcp_low_latency, 572 .data = &sysctl_tcp_low_latency,
573 .maxlen = sizeof(int), 573 .maxlen = sizeof(int),
574 .mode = 0644, 574 .mode = 0644,
575 .proc_handler = &proc_dointvec 575 .proc_handler = proc_dointvec
576 }, 576 },
577 { 577 {
578 .ctl_name = NET_TCP_NO_METRICS_SAVE, 578 .ctl_name = NET_TCP_NO_METRICS_SAVE,
@@ -580,7 +580,7 @@ static struct ctl_table ipv4_table[] = {
580 .data = &sysctl_tcp_nometrics_save, 580 .data = &sysctl_tcp_nometrics_save,
581 .maxlen = sizeof(int), 581 .maxlen = sizeof(int),
582 .mode = 0644, 582 .mode = 0644,
583 .proc_handler = &proc_dointvec, 583 .proc_handler = proc_dointvec,
584 }, 584 },
585 { 585 {
586 .ctl_name = NET_TCP_MODERATE_RCVBUF, 586 .ctl_name = NET_TCP_MODERATE_RCVBUF,
@@ -588,7 +588,7 @@ static struct ctl_table ipv4_table[] = {
588 .data = &sysctl_tcp_moderate_rcvbuf, 588 .data = &sysctl_tcp_moderate_rcvbuf,
589 .maxlen = sizeof(int), 589 .maxlen = sizeof(int),
590 .mode = 0644, 590 .mode = 0644,
591 .proc_handler = &proc_dointvec, 591 .proc_handler = proc_dointvec,
592 }, 592 },
593 { 593 {
594 .ctl_name = NET_TCP_TSO_WIN_DIVISOR, 594 .ctl_name = NET_TCP_TSO_WIN_DIVISOR,
@@ -596,15 +596,15 @@ static struct ctl_table ipv4_table[] = {
596 .data = &sysctl_tcp_tso_win_divisor, 596 .data = &sysctl_tcp_tso_win_divisor,
597 .maxlen = sizeof(int), 597 .maxlen = sizeof(int),
598 .mode = 0644, 598 .mode = 0644,
599 .proc_handler = &proc_dointvec, 599 .proc_handler = proc_dointvec,
600 }, 600 },
601 { 601 {
602 .ctl_name = NET_TCP_CONG_CONTROL, 602 .ctl_name = NET_TCP_CONG_CONTROL,
603 .procname = "tcp_congestion_control", 603 .procname = "tcp_congestion_control",
604 .mode = 0644, 604 .mode = 0644,
605 .maxlen = TCP_CA_NAME_MAX, 605 .maxlen = TCP_CA_NAME_MAX,
606 .proc_handler = &proc_tcp_congestion_control, 606 .proc_handler = proc_tcp_congestion_control,
607 .strategy = &sysctl_tcp_congestion_control, 607 .strategy = sysctl_tcp_congestion_control,
608 }, 608 },
609 { 609 {
610 .ctl_name = NET_TCP_ABC, 610 .ctl_name = NET_TCP_ABC,
@@ -612,7 +612,7 @@ static struct ctl_table ipv4_table[] = {
612 .data = &sysctl_tcp_abc, 612 .data = &sysctl_tcp_abc,
613 .maxlen = sizeof(int), 613 .maxlen = sizeof(int),
614 .mode = 0644, 614 .mode = 0644,
615 .proc_handler = &proc_dointvec, 615 .proc_handler = proc_dointvec,
616 }, 616 },
617 { 617 {
618 .ctl_name = NET_TCP_MTU_PROBING, 618 .ctl_name = NET_TCP_MTU_PROBING,
@@ -620,7 +620,7 @@ static struct ctl_table ipv4_table[] = {
620 .data = &sysctl_tcp_mtu_probing, 620 .data = &sysctl_tcp_mtu_probing,
621 .maxlen = sizeof(int), 621 .maxlen = sizeof(int),
622 .mode = 0644, 622 .mode = 0644,
623 .proc_handler = &proc_dointvec, 623 .proc_handler = proc_dointvec,
624 }, 624 },
625 { 625 {
626 .ctl_name = NET_TCP_BASE_MSS, 626 .ctl_name = NET_TCP_BASE_MSS,
@@ -628,7 +628,7 @@ static struct ctl_table ipv4_table[] = {
628 .data = &sysctl_tcp_base_mss, 628 .data = &sysctl_tcp_base_mss,
629 .maxlen = sizeof(int), 629 .maxlen = sizeof(int),
630 .mode = 0644, 630 .mode = 0644,
631 .proc_handler = &proc_dointvec, 631 .proc_handler = proc_dointvec,
632 }, 632 },
633 { 633 {
634 .ctl_name = NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS, 634 .ctl_name = NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS,
@@ -636,7 +636,7 @@ static struct ctl_table ipv4_table[] = {
636 .data = &sysctl_tcp_workaround_signed_windows, 636 .data = &sysctl_tcp_workaround_signed_windows,
637 .maxlen = sizeof(int), 637 .maxlen = sizeof(int),
638 .mode = 0644, 638 .mode = 0644,
639 .proc_handler = &proc_dointvec 639 .proc_handler = proc_dointvec
640 }, 640 },
641#ifdef CONFIG_NET_DMA 641#ifdef CONFIG_NET_DMA
642 { 642 {
@@ -645,7 +645,7 @@ static struct ctl_table ipv4_table[] = {
645 .data = &sysctl_tcp_dma_copybreak, 645 .data = &sysctl_tcp_dma_copybreak,
646 .maxlen = sizeof(int), 646 .maxlen = sizeof(int),
647 .mode = 0644, 647 .mode = 0644,
648 .proc_handler = &proc_dointvec 648 .proc_handler = proc_dointvec
649 }, 649 },
650#endif 650#endif
651 { 651 {
@@ -654,7 +654,7 @@ static struct ctl_table ipv4_table[] = {
654 .data = &sysctl_tcp_slow_start_after_idle, 654 .data = &sysctl_tcp_slow_start_after_idle,
655 .maxlen = sizeof(int), 655 .maxlen = sizeof(int),
656 .mode = 0644, 656 .mode = 0644,
657 .proc_handler = &proc_dointvec 657 .proc_handler = proc_dointvec
658 }, 658 },
659#ifdef CONFIG_NETLABEL 659#ifdef CONFIG_NETLABEL
660 { 660 {
@@ -663,7 +663,7 @@ static struct ctl_table ipv4_table[] = {
663 .data = &cipso_v4_cache_enabled, 663 .data = &cipso_v4_cache_enabled,
664 .maxlen = sizeof(int), 664 .maxlen = sizeof(int),
665 .mode = 0644, 665 .mode = 0644,
666 .proc_handler = &proc_dointvec, 666 .proc_handler = proc_dointvec,
667 }, 667 },
668 { 668 {
669 .ctl_name = NET_CIPSOV4_CACHE_BUCKET_SIZE, 669 .ctl_name = NET_CIPSOV4_CACHE_BUCKET_SIZE,
@@ -671,7 +671,7 @@ static struct ctl_table ipv4_table[] = {
671 .data = &cipso_v4_cache_bucketsize, 671 .data = &cipso_v4_cache_bucketsize,
672 .maxlen = sizeof(int), 672 .maxlen = sizeof(int),
673 .mode = 0644, 673 .mode = 0644,
674 .proc_handler = &proc_dointvec, 674 .proc_handler = proc_dointvec,
675 }, 675 },
676 { 676 {
677 .ctl_name = NET_CIPSOV4_RBM_OPTFMT, 677 .ctl_name = NET_CIPSOV4_RBM_OPTFMT,
@@ -679,7 +679,7 @@ static struct ctl_table ipv4_table[] = {
679 .data = &cipso_v4_rbm_optfmt, 679 .data = &cipso_v4_rbm_optfmt,
680 .maxlen = sizeof(int), 680 .maxlen = sizeof(int),
681 .mode = 0644, 681 .mode = 0644,
682 .proc_handler = &proc_dointvec, 682 .proc_handler = proc_dointvec,
683 }, 683 },
684 { 684 {
685 .ctl_name = NET_CIPSOV4_RBM_STRICTVALID, 685 .ctl_name = NET_CIPSOV4_RBM_STRICTVALID,
@@ -687,22 +687,22 @@ static struct ctl_table ipv4_table[] = {
687 .data = &cipso_v4_rbm_strictvalid, 687 .data = &cipso_v4_rbm_strictvalid,
688 .maxlen = sizeof(int), 688 .maxlen = sizeof(int),
689 .mode = 0644, 689 .mode = 0644,
690 .proc_handler = &proc_dointvec, 690 .proc_handler = proc_dointvec,
691 }, 691 },
692#endif /* CONFIG_NETLABEL */ 692#endif /* CONFIG_NETLABEL */
693 { 693 {
694 .procname = "tcp_available_congestion_control", 694 .procname = "tcp_available_congestion_control",
695 .maxlen = TCP_CA_BUF_MAX, 695 .maxlen = TCP_CA_BUF_MAX,
696 .mode = 0444, 696 .mode = 0444,
697 .proc_handler = &proc_tcp_available_congestion_control, 697 .proc_handler = proc_tcp_available_congestion_control,
698 }, 698 },
699 { 699 {
700 .ctl_name = NET_TCP_ALLOWED_CONG_CONTROL, 700 .ctl_name = NET_TCP_ALLOWED_CONG_CONTROL,
701 .procname = "tcp_allowed_congestion_control", 701 .procname = "tcp_allowed_congestion_control",
702 .maxlen = TCP_CA_BUF_MAX, 702 .maxlen = TCP_CA_BUF_MAX,
703 .mode = 0644, 703 .mode = 0644,
704 .proc_handler = &proc_allowed_congestion_control, 704 .proc_handler = proc_allowed_congestion_control,
705 .strategy = &strategy_allowed_congestion_control, 705 .strategy = strategy_allowed_congestion_control,
706 }, 706 },
707 { 707 {
708 .ctl_name = NET_TCP_MAX_SSTHRESH, 708 .ctl_name = NET_TCP_MAX_SSTHRESH,
@@ -710,7 +710,7 @@ static struct ctl_table ipv4_table[] = {
710 .data = &sysctl_tcp_max_ssthresh, 710 .data = &sysctl_tcp_max_ssthresh,
711 .maxlen = sizeof(int), 711 .maxlen = sizeof(int),
712 .mode = 0644, 712 .mode = 0644,
713 .proc_handler = &proc_dointvec, 713 .proc_handler = proc_dointvec,
714 }, 714 },
715 { 715 {
716 .ctl_name = CTL_UNNUMBERED, 716 .ctl_name = CTL_UNNUMBERED,
@@ -718,8 +718,8 @@ static struct ctl_table ipv4_table[] = {
718 .data = &sysctl_udp_mem, 718 .data = &sysctl_udp_mem,
719 .maxlen = sizeof(sysctl_udp_mem), 719 .maxlen = sizeof(sysctl_udp_mem),
720 .mode = 0644, 720 .mode = 0644,
721 .proc_handler = &proc_dointvec_minmax, 721 .proc_handler = proc_dointvec_minmax,
722 .strategy = &sysctl_intvec, 722 .strategy = sysctl_intvec,
723 .extra1 = &zero 723 .extra1 = &zero
724 }, 724 },
725 { 725 {
@@ -728,8 +728,8 @@ static struct ctl_table ipv4_table[] = {
728 .data = &sysctl_udp_rmem_min, 728 .data = &sysctl_udp_rmem_min,
729 .maxlen = sizeof(sysctl_udp_rmem_min), 729 .maxlen = sizeof(sysctl_udp_rmem_min),
730 .mode = 0644, 730 .mode = 0644,
731 .proc_handler = &proc_dointvec_minmax, 731 .proc_handler = proc_dointvec_minmax,
732 .strategy = &sysctl_intvec, 732 .strategy = sysctl_intvec,
733 .extra1 = &zero 733 .extra1 = &zero
734 }, 734 },
735 { 735 {
@@ -738,8 +738,8 @@ static struct ctl_table ipv4_table[] = {
738 .data = &sysctl_udp_wmem_min, 738 .data = &sysctl_udp_wmem_min,
739 .maxlen = sizeof(sysctl_udp_wmem_min), 739 .maxlen = sizeof(sysctl_udp_wmem_min),
740 .mode = 0644, 740 .mode = 0644,
741 .proc_handler = &proc_dointvec_minmax, 741 .proc_handler = proc_dointvec_minmax,
742 .strategy = &sysctl_intvec, 742 .strategy = sysctl_intvec,
743 .extra1 = &zero 743 .extra1 = &zero
744 }, 744 },
745 { .ctl_name = 0 } 745 { .ctl_name = 0 }
@@ -752,7 +752,7 @@ static struct ctl_table ipv4_net_table[] = {
752 .data = &init_net.ipv4.sysctl_icmp_echo_ignore_all, 752 .data = &init_net.ipv4.sysctl_icmp_echo_ignore_all,
753 .maxlen = sizeof(int), 753 .maxlen = sizeof(int),
754 .mode = 0644, 754 .mode = 0644,
755 .proc_handler = &proc_dointvec 755 .proc_handler = proc_dointvec
756 }, 756 },
757 { 757 {
758 .ctl_name = NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS, 758 .ctl_name = NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS,
@@ -760,7 +760,7 @@ static struct ctl_table ipv4_net_table[] = {
760 .data = &init_net.ipv4.sysctl_icmp_echo_ignore_broadcasts, 760 .data = &init_net.ipv4.sysctl_icmp_echo_ignore_broadcasts,
761 .maxlen = sizeof(int), 761 .maxlen = sizeof(int),
762 .mode = 0644, 762 .mode = 0644,
763 .proc_handler = &proc_dointvec 763 .proc_handler = proc_dointvec
764 }, 764 },
765 { 765 {
766 .ctl_name = NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES, 766 .ctl_name = NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES,
@@ -768,7 +768,7 @@ static struct ctl_table ipv4_net_table[] = {
768 .data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses, 768 .data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses,
769 .maxlen = sizeof(int), 769 .maxlen = sizeof(int),
770 .mode = 0644, 770 .mode = 0644,
771 .proc_handler = &proc_dointvec 771 .proc_handler = proc_dointvec
772 }, 772 },
773 { 773 {
774 .ctl_name = NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR, 774 .ctl_name = NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR,
@@ -776,7 +776,7 @@ static struct ctl_table ipv4_net_table[] = {
776 .data = &init_net.ipv4.sysctl_icmp_errors_use_inbound_ifaddr, 776 .data = &init_net.ipv4.sysctl_icmp_errors_use_inbound_ifaddr,
777 .maxlen = sizeof(int), 777 .maxlen = sizeof(int),
778 .mode = 0644, 778 .mode = 0644,
779 .proc_handler = &proc_dointvec 779 .proc_handler = proc_dointvec
780 }, 780 },
781 { 781 {
782 .ctl_name = NET_IPV4_ICMP_RATELIMIT, 782 .ctl_name = NET_IPV4_ICMP_RATELIMIT,
@@ -784,8 +784,8 @@ static struct ctl_table ipv4_net_table[] = {
784 .data = &init_net.ipv4.sysctl_icmp_ratelimit, 784 .data = &init_net.ipv4.sysctl_icmp_ratelimit,
785 .maxlen = sizeof(int), 785 .maxlen = sizeof(int),
786 .mode = 0644, 786 .mode = 0644,
787 .proc_handler = &proc_dointvec_ms_jiffies, 787 .proc_handler = proc_dointvec_ms_jiffies,
788 .strategy = &sysctl_ms_jiffies 788 .strategy = sysctl_ms_jiffies
789 }, 789 },
790 { 790 {
791 .ctl_name = NET_IPV4_ICMP_RATEMASK, 791 .ctl_name = NET_IPV4_ICMP_RATEMASK,
@@ -793,7 +793,7 @@ static struct ctl_table ipv4_net_table[] = {
793 .data = &init_net.ipv4.sysctl_icmp_ratemask, 793 .data = &init_net.ipv4.sysctl_icmp_ratemask,
794 .maxlen = sizeof(int), 794 .maxlen = sizeof(int),
795 .mode = 0644, 795 .mode = 0644,
796 .proc_handler = &proc_dointvec 796 .proc_handler = proc_dointvec
797 }, 797 },
798 { 798 {
799 .ctl_name = CTL_UNNUMBERED, 799 .ctl_name = CTL_UNNUMBERED,
@@ -801,7 +801,7 @@ static struct ctl_table ipv4_net_table[] = {
801 .data = &init_net.ipv4.sysctl_rt_cache_rebuild_count, 801 .data = &init_net.ipv4.sysctl_rt_cache_rebuild_count,
802 .maxlen = sizeof(int), 802 .maxlen = sizeof(int),
803 .mode = 0644, 803 .mode = 0644,
804 .proc_handler = &proc_dointvec 804 .proc_handler = proc_dointvec
805 }, 805 },
806 { } 806 { }
807}; 807};
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index ff7ae05f72e1..07ee758de9e1 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4030,8 +4030,8 @@ static struct addrconf_sysctl_table
4030 .data = &ipv6_devconf.forwarding, 4030 .data = &ipv6_devconf.forwarding,
4031 .maxlen = sizeof(int), 4031 .maxlen = sizeof(int),
4032 .mode = 0644, 4032 .mode = 0644,
4033 .proc_handler = &addrconf_sysctl_forward, 4033 .proc_handler = addrconf_sysctl_forward,
4034 .strategy = &addrconf_sysctl_forward_strategy, 4034 .strategy = addrconf_sysctl_forward_strategy,
4035 }, 4035 },
4036 { 4036 {
4037 .ctl_name = NET_IPV6_HOP_LIMIT, 4037 .ctl_name = NET_IPV6_HOP_LIMIT,
@@ -4047,7 +4047,7 @@ static struct addrconf_sysctl_table
4047 .data = &ipv6_devconf.mtu6, 4047 .data = &ipv6_devconf.mtu6,
4048 .maxlen = sizeof(int), 4048 .maxlen = sizeof(int),
4049 .mode = 0644, 4049 .mode = 0644,
4050 .proc_handler = &proc_dointvec, 4050 .proc_handler = proc_dointvec,
4051 }, 4051 },
4052 { 4052 {
4053 .ctl_name = NET_IPV6_ACCEPT_RA, 4053 .ctl_name = NET_IPV6_ACCEPT_RA,
@@ -4055,7 +4055,7 @@ static struct addrconf_sysctl_table
4055 .data = &ipv6_devconf.accept_ra, 4055 .data = &ipv6_devconf.accept_ra,
4056 .maxlen = sizeof(int), 4056 .maxlen = sizeof(int),
4057 .mode = 0644, 4057 .mode = 0644,
4058 .proc_handler = &proc_dointvec, 4058 .proc_handler = proc_dointvec,
4059 }, 4059 },
4060 { 4060 {
4061 .ctl_name = NET_IPV6_ACCEPT_REDIRECTS, 4061 .ctl_name = NET_IPV6_ACCEPT_REDIRECTS,
@@ -4063,7 +4063,7 @@ static struct addrconf_sysctl_table
4063 .data = &ipv6_devconf.accept_redirects, 4063 .data = &ipv6_devconf.accept_redirects,
4064 .maxlen = sizeof(int), 4064 .maxlen = sizeof(int),
4065 .mode = 0644, 4065 .mode = 0644,
4066 .proc_handler = &proc_dointvec, 4066 .proc_handler = proc_dointvec,
4067 }, 4067 },
4068 { 4068 {
4069 .ctl_name = NET_IPV6_AUTOCONF, 4069 .ctl_name = NET_IPV6_AUTOCONF,
@@ -4071,7 +4071,7 @@ static struct addrconf_sysctl_table
4071 .data = &ipv6_devconf.autoconf, 4071 .data = &ipv6_devconf.autoconf,
4072 .maxlen = sizeof(int), 4072 .maxlen = sizeof(int),
4073 .mode = 0644, 4073 .mode = 0644,
4074 .proc_handler = &proc_dointvec, 4074 .proc_handler = proc_dointvec,
4075 }, 4075 },
4076 { 4076 {
4077 .ctl_name = NET_IPV6_DAD_TRANSMITS, 4077 .ctl_name = NET_IPV6_DAD_TRANSMITS,
@@ -4079,7 +4079,7 @@ static struct addrconf_sysctl_table
4079 .data = &ipv6_devconf.dad_transmits, 4079 .data = &ipv6_devconf.dad_transmits,
4080 .maxlen = sizeof(int), 4080 .maxlen = sizeof(int),
4081 .mode = 0644, 4081 .mode = 0644,
4082 .proc_handler = &proc_dointvec, 4082 .proc_handler = proc_dointvec,
4083 }, 4083 },
4084 { 4084 {
4085 .ctl_name = NET_IPV6_RTR_SOLICITS, 4085 .ctl_name = NET_IPV6_RTR_SOLICITS,
@@ -4087,7 +4087,7 @@ static struct addrconf_sysctl_table
4087 .data = &ipv6_devconf.rtr_solicits, 4087 .data = &ipv6_devconf.rtr_solicits,
4088 .maxlen = sizeof(int), 4088 .maxlen = sizeof(int),
4089 .mode = 0644, 4089 .mode = 0644,
4090 .proc_handler = &proc_dointvec, 4090 .proc_handler = proc_dointvec,
4091 }, 4091 },
4092 { 4092 {
4093 .ctl_name = NET_IPV6_RTR_SOLICIT_INTERVAL, 4093 .ctl_name = NET_IPV6_RTR_SOLICIT_INTERVAL,
@@ -4095,8 +4095,8 @@ static struct addrconf_sysctl_table
4095 .data = &ipv6_devconf.rtr_solicit_interval, 4095 .data = &ipv6_devconf.rtr_solicit_interval,
4096 .maxlen = sizeof(int), 4096 .maxlen = sizeof(int),
4097 .mode = 0644, 4097 .mode = 0644,
4098 .proc_handler = &proc_dointvec_jiffies, 4098 .proc_handler = proc_dointvec_jiffies,
4099 .strategy = &sysctl_jiffies, 4099 .strategy = sysctl_jiffies,
4100 }, 4100 },
4101 { 4101 {
4102 .ctl_name = NET_IPV6_RTR_SOLICIT_DELAY, 4102 .ctl_name = NET_IPV6_RTR_SOLICIT_DELAY,
@@ -4104,8 +4104,8 @@ static struct addrconf_sysctl_table
4104 .data = &ipv6_devconf.rtr_solicit_delay, 4104 .data = &ipv6_devconf.rtr_solicit_delay,
4105 .maxlen = sizeof(int), 4105 .maxlen = sizeof(int),
4106 .mode = 0644, 4106 .mode = 0644,
4107 .proc_handler = &proc_dointvec_jiffies, 4107 .proc_handler = proc_dointvec_jiffies,
4108 .strategy = &sysctl_jiffies, 4108 .strategy = sysctl_jiffies,
4109 }, 4109 },
4110 { 4110 {
4111 .ctl_name = NET_IPV6_FORCE_MLD_VERSION, 4111 .ctl_name = NET_IPV6_FORCE_MLD_VERSION,
@@ -4113,7 +4113,7 @@ static struct addrconf_sysctl_table
4113 .data = &ipv6_devconf.force_mld_version, 4113 .data = &ipv6_devconf.force_mld_version,
4114 .maxlen = sizeof(int), 4114 .maxlen = sizeof(int),
4115 .mode = 0644, 4115 .mode = 0644,
4116 .proc_handler = &proc_dointvec, 4116 .proc_handler = proc_dointvec,
4117 }, 4117 },
4118#ifdef CONFIG_IPV6_PRIVACY 4118#ifdef CONFIG_IPV6_PRIVACY
4119 { 4119 {
@@ -4122,7 +4122,7 @@ static struct addrconf_sysctl_table
4122 .data = &ipv6_devconf.use_tempaddr, 4122 .data = &ipv6_devconf.use_tempaddr,
4123 .maxlen = sizeof(int), 4123 .maxlen = sizeof(int),
4124 .mode = 0644, 4124 .mode = 0644,
4125 .proc_handler = &proc_dointvec, 4125 .proc_handler = proc_dointvec,
4126 }, 4126 },
4127 { 4127 {
4128 .ctl_name = NET_IPV6_TEMP_VALID_LFT, 4128 .ctl_name = NET_IPV6_TEMP_VALID_LFT,
@@ -4130,7 +4130,7 @@ static struct addrconf_sysctl_table
4130 .data = &ipv6_devconf.temp_valid_lft, 4130 .data = &ipv6_devconf.temp_valid_lft,
4131 .maxlen = sizeof(int), 4131 .maxlen = sizeof(int),
4132 .mode = 0644, 4132 .mode = 0644,
4133 .proc_handler = &proc_dointvec, 4133 .proc_handler = proc_dointvec,
4134 }, 4134 },
4135 { 4135 {
4136 .ctl_name = NET_IPV6_TEMP_PREFERED_LFT, 4136 .ctl_name = NET_IPV6_TEMP_PREFERED_LFT,
@@ -4138,7 +4138,7 @@ static struct addrconf_sysctl_table
4138 .data = &ipv6_devconf.temp_prefered_lft, 4138 .data = &ipv6_devconf.temp_prefered_lft,
4139 .maxlen = sizeof(int), 4139 .maxlen = sizeof(int),
4140 .mode = 0644, 4140 .mode = 0644,
4141 .proc_handler = &proc_dointvec, 4141 .proc_handler = proc_dointvec,
4142 }, 4142 },
4143 { 4143 {
4144 .ctl_name = NET_IPV6_REGEN_MAX_RETRY, 4144 .ctl_name = NET_IPV6_REGEN_MAX_RETRY,
@@ -4146,7 +4146,7 @@ static struct addrconf_sysctl_table
4146 .data = &ipv6_devconf.regen_max_retry, 4146 .data = &ipv6_devconf.regen_max_retry,
4147 .maxlen = sizeof(int), 4147 .maxlen = sizeof(int),
4148 .mode = 0644, 4148 .mode = 0644,
4149 .proc_handler = &proc_dointvec, 4149 .proc_handler = proc_dointvec,
4150 }, 4150 },
4151 { 4151 {
4152 .ctl_name = NET_IPV6_MAX_DESYNC_FACTOR, 4152 .ctl_name = NET_IPV6_MAX_DESYNC_FACTOR,
@@ -4154,7 +4154,7 @@ static struct addrconf_sysctl_table
4154 .data = &ipv6_devconf.max_desync_factor, 4154 .data = &ipv6_devconf.max_desync_factor,
4155 .maxlen = sizeof(int), 4155 .maxlen = sizeof(int),
4156 .mode = 0644, 4156 .mode = 0644,
4157 .proc_handler = &proc_dointvec, 4157 .proc_handler = proc_dointvec,
4158 }, 4158 },
4159#endif 4159#endif
4160 { 4160 {
@@ -4163,7 +4163,7 @@ static struct addrconf_sysctl_table
4163 .data = &ipv6_devconf.max_addresses, 4163 .data = &ipv6_devconf.max_addresses,
4164 .maxlen = sizeof(int), 4164 .maxlen = sizeof(int),
4165 .mode = 0644, 4165 .mode = 0644,
4166 .proc_handler = &proc_dointvec, 4166 .proc_handler = proc_dointvec,
4167 }, 4167 },
4168 { 4168 {
4169 .ctl_name = NET_IPV6_ACCEPT_RA_DEFRTR, 4169 .ctl_name = NET_IPV6_ACCEPT_RA_DEFRTR,
@@ -4171,7 +4171,7 @@ static struct addrconf_sysctl_table
4171 .data = &ipv6_devconf.accept_ra_defrtr, 4171 .data = &ipv6_devconf.accept_ra_defrtr,
4172 .maxlen = sizeof(int), 4172 .maxlen = sizeof(int),
4173 .mode = 0644, 4173 .mode = 0644,
4174 .proc_handler = &proc_dointvec, 4174 .proc_handler = proc_dointvec,
4175 }, 4175 },
4176 { 4176 {
4177 .ctl_name = NET_IPV6_ACCEPT_RA_PINFO, 4177 .ctl_name = NET_IPV6_ACCEPT_RA_PINFO,
@@ -4179,7 +4179,7 @@ static struct addrconf_sysctl_table
4179 .data = &ipv6_devconf.accept_ra_pinfo, 4179 .data = &ipv6_devconf.accept_ra_pinfo,
4180 .maxlen = sizeof(int), 4180 .maxlen = sizeof(int),
4181 .mode = 0644, 4181 .mode = 0644,
4182 .proc_handler = &proc_dointvec, 4182 .proc_handler = proc_dointvec,
4183 }, 4183 },
4184#ifdef CONFIG_IPV6_ROUTER_PREF 4184#ifdef CONFIG_IPV6_ROUTER_PREF
4185 { 4185 {
@@ -4188,7 +4188,7 @@ static struct addrconf_sysctl_table
4188 .data = &ipv6_devconf.accept_ra_rtr_pref, 4188 .data = &ipv6_devconf.accept_ra_rtr_pref,
4189 .maxlen = sizeof(int), 4189 .maxlen = sizeof(int),
4190 .mode = 0644, 4190 .mode = 0644,
4191 .proc_handler = &proc_dointvec, 4191 .proc_handler = proc_dointvec,
4192 }, 4192 },
4193 { 4193 {
4194 .ctl_name = NET_IPV6_RTR_PROBE_INTERVAL, 4194 .ctl_name = NET_IPV6_RTR_PROBE_INTERVAL,
@@ -4196,8 +4196,8 @@ static struct addrconf_sysctl_table
4196 .data = &ipv6_devconf.rtr_probe_interval, 4196 .data = &ipv6_devconf.rtr_probe_interval,
4197 .maxlen = sizeof(int), 4197 .maxlen = sizeof(int),
4198 .mode = 0644, 4198 .mode = 0644,
4199 .proc_handler = &proc_dointvec_jiffies, 4199 .proc_handler = proc_dointvec_jiffies,
4200 .strategy = &sysctl_jiffies, 4200 .strategy = sysctl_jiffies,
4201 }, 4201 },
4202#ifdef CONFIG_IPV6_ROUTE_INFO 4202#ifdef CONFIG_IPV6_ROUTE_INFO
4203 { 4203 {
@@ -4206,7 +4206,7 @@ static struct addrconf_sysctl_table
4206 .data = &ipv6_devconf.accept_ra_rt_info_max_plen, 4206 .data = &ipv6_devconf.accept_ra_rt_info_max_plen,
4207 .maxlen = sizeof(int), 4207 .maxlen = sizeof(int),
4208 .mode = 0644, 4208 .mode = 0644,
4209 .proc_handler = &proc_dointvec, 4209 .proc_handler = proc_dointvec,
4210 }, 4210 },
4211#endif 4211#endif
4212#endif 4212#endif
@@ -4216,7 +4216,7 @@ static struct addrconf_sysctl_table
4216 .data = &ipv6_devconf.proxy_ndp, 4216 .data = &ipv6_devconf.proxy_ndp,
4217 .maxlen = sizeof(int), 4217 .maxlen = sizeof(int),
4218 .mode = 0644, 4218 .mode = 0644,
4219 .proc_handler = &proc_dointvec, 4219 .proc_handler = proc_dointvec,
4220 }, 4220 },
4221 { 4221 {
4222 .ctl_name = NET_IPV6_ACCEPT_SOURCE_ROUTE, 4222 .ctl_name = NET_IPV6_ACCEPT_SOURCE_ROUTE,
@@ -4224,7 +4224,7 @@ static struct addrconf_sysctl_table
4224 .data = &ipv6_devconf.accept_source_route, 4224 .data = &ipv6_devconf.accept_source_route,
4225 .maxlen = sizeof(int), 4225 .maxlen = sizeof(int),
4226 .mode = 0644, 4226 .mode = 0644,
4227 .proc_handler = &proc_dointvec, 4227 .proc_handler = proc_dointvec,
4228 }, 4228 },
4229#ifdef CONFIG_IPV6_OPTIMISTIC_DAD 4229#ifdef CONFIG_IPV6_OPTIMISTIC_DAD
4230 { 4230 {
@@ -4233,7 +4233,7 @@ static struct addrconf_sysctl_table
4233 .data = &ipv6_devconf.optimistic_dad, 4233 .data = &ipv6_devconf.optimistic_dad,
4234 .maxlen = sizeof(int), 4234 .maxlen = sizeof(int),
4235 .mode = 0644, 4235 .mode = 0644,
4236 .proc_handler = &proc_dointvec, 4236 .proc_handler = proc_dointvec,
4237 4237
4238 }, 4238 },
4239#endif 4239#endif
@@ -4244,7 +4244,7 @@ static struct addrconf_sysctl_table
4244 .data = &ipv6_devconf.mc_forwarding, 4244 .data = &ipv6_devconf.mc_forwarding,
4245 .maxlen = sizeof(int), 4245 .maxlen = sizeof(int),
4246 .mode = 0644, 4246 .mode = 0644,
4247 .proc_handler = &proc_dointvec, 4247 .proc_handler = proc_dointvec,
4248 }, 4248 },
4249#endif 4249#endif
4250 { 4250 {
@@ -4253,7 +4253,7 @@ static struct addrconf_sysctl_table
4253 .data = &ipv6_devconf.disable_ipv6, 4253 .data = &ipv6_devconf.disable_ipv6,
4254 .maxlen = sizeof(int), 4254 .maxlen = sizeof(int),
4255 .mode = 0644, 4255 .mode = 0644,
4256 .proc_handler = &proc_dointvec, 4256 .proc_handler = proc_dointvec,
4257 }, 4257 },
4258 { 4258 {
4259 .ctl_name = CTL_UNNUMBERED, 4259 .ctl_name = CTL_UNNUMBERED,
@@ -4261,7 +4261,7 @@ static struct addrconf_sysctl_table
4261 .data = &ipv6_devconf.accept_dad, 4261 .data = &ipv6_devconf.accept_dad,
4262 .maxlen = sizeof(int), 4262 .maxlen = sizeof(int),
4263 .mode = 0644, 4263 .mode = 0644,
4264 .proc_handler = &proc_dointvec, 4264 .proc_handler = proc_dointvec,
4265 }, 4265 },
4266 { 4266 {
4267 .ctl_name = 0, /* sentinel */ 4267 .ctl_name = 0, /* sentinel */
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 3c2821f9b529..be351009fd03 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -956,8 +956,8 @@ ctl_table ipv6_icmp_table_template[] = {
956 .data = &init_net.ipv6.sysctl.icmpv6_time, 956 .data = &init_net.ipv6.sysctl.icmpv6_time,
957 .maxlen = sizeof(int), 957 .maxlen = sizeof(int),
958 .mode = 0644, 958 .mode = 0644,
959 .proc_handler = &proc_dointvec_ms_jiffies, 959 .proc_handler = proc_dointvec_ms_jiffies,
960 .strategy = &sysctl_ms_jiffies 960 .strategy = sysctl_ms_jiffies
961 }, 961 },
962 { .ctl_name = 0 }, 962 { .ctl_name = 0 },
963}; 963};
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
index 05726177903f..bd52151d31e9 100644
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -253,7 +253,7 @@ static struct ctl_table icmpv6_sysctl_table[] = {
253 .data = &nf_ct_icmpv6_timeout, 253 .data = &nf_ct_icmpv6_timeout,
254 .maxlen = sizeof(unsigned int), 254 .maxlen = sizeof(unsigned int),
255 .mode = 0644, 255 .mode = 0644,
256 .proc_handler = &proc_dointvec_jiffies, 256 .proc_handler = proc_dointvec_jiffies,
257 }, 257 },
258 { 258 {
259 .ctl_name = 0 259 .ctl_name = 0
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 9967ac7a01a8..ed4d79a9e4a6 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -80,7 +80,7 @@ struct ctl_table nf_ct_ipv6_sysctl_table[] = {
80 .data = &nf_init_frags.timeout, 80 .data = &nf_init_frags.timeout,
81 .maxlen = sizeof(unsigned int), 81 .maxlen = sizeof(unsigned int),
82 .mode = 0644, 82 .mode = 0644,
83 .proc_handler = &proc_dointvec_jiffies, 83 .proc_handler = proc_dointvec_jiffies,
84 }, 84 },
85 { 85 {
86 .ctl_name = NET_NF_CONNTRACK_FRAG6_LOW_THRESH, 86 .ctl_name = NET_NF_CONNTRACK_FRAG6_LOW_THRESH,
@@ -88,7 +88,7 @@ struct ctl_table nf_ct_ipv6_sysctl_table[] = {
88 .data = &nf_init_frags.low_thresh, 88 .data = &nf_init_frags.low_thresh,
89 .maxlen = sizeof(unsigned int), 89 .maxlen = sizeof(unsigned int),
90 .mode = 0644, 90 .mode = 0644,
91 .proc_handler = &proc_dointvec, 91 .proc_handler = proc_dointvec,
92 }, 92 },
93 { 93 {
94 .ctl_name = NET_NF_CONNTRACK_FRAG6_HIGH_THRESH, 94 .ctl_name = NET_NF_CONNTRACK_FRAG6_HIGH_THRESH,
@@ -96,7 +96,7 @@ struct ctl_table nf_ct_ipv6_sysctl_table[] = {
96 .data = &nf_init_frags.high_thresh, 96 .data = &nf_init_frags.high_thresh,
97 .maxlen = sizeof(unsigned int), 97 .maxlen = sizeof(unsigned int),
98 .mode = 0644, 98 .mode = 0644,
99 .proc_handler = &proc_dointvec, 99 .proc_handler = proc_dointvec,
100 }, 100 },
101 { .ctl_name = 0 } 101 { .ctl_name = 0 }
102}; 102};
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index af12de071f4c..3c575118fca5 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -642,7 +642,7 @@ static struct ctl_table ip6_frags_ns_ctl_table[] = {
642 .data = &init_net.ipv6.frags.high_thresh, 642 .data = &init_net.ipv6.frags.high_thresh,
643 .maxlen = sizeof(int), 643 .maxlen = sizeof(int),
644 .mode = 0644, 644 .mode = 0644,
645 .proc_handler = &proc_dointvec 645 .proc_handler = proc_dointvec
646 }, 646 },
647 { 647 {
648 .ctl_name = NET_IPV6_IP6FRAG_LOW_THRESH, 648 .ctl_name = NET_IPV6_IP6FRAG_LOW_THRESH,
@@ -650,7 +650,7 @@ static struct ctl_table ip6_frags_ns_ctl_table[] = {
650 .data = &init_net.ipv6.frags.low_thresh, 650 .data = &init_net.ipv6.frags.low_thresh,
651 .maxlen = sizeof(int), 651 .maxlen = sizeof(int),
652 .mode = 0644, 652 .mode = 0644,
653 .proc_handler = &proc_dointvec 653 .proc_handler = proc_dointvec
654 }, 654 },
655 { 655 {
656 .ctl_name = NET_IPV6_IP6FRAG_TIME, 656 .ctl_name = NET_IPV6_IP6FRAG_TIME,
@@ -658,8 +658,8 @@ static struct ctl_table ip6_frags_ns_ctl_table[] = {
658 .data = &init_net.ipv6.frags.timeout, 658 .data = &init_net.ipv6.frags.timeout,
659 .maxlen = sizeof(int), 659 .maxlen = sizeof(int),
660 .mode = 0644, 660 .mode = 0644,
661 .proc_handler = &proc_dointvec_jiffies, 661 .proc_handler = proc_dointvec_jiffies,
662 .strategy = &sysctl_jiffies, 662 .strategy = sysctl_jiffies,
663 }, 663 },
664 { } 664 { }
665}; 665};
@@ -671,8 +671,8 @@ static struct ctl_table ip6_frags_ctl_table[] = {
671 .data = &ip6_frags.secret_interval, 671 .data = &ip6_frags.secret_interval,
672 .maxlen = sizeof(int), 672 .maxlen = sizeof(int),
673 .mode = 0644, 673 .mode = 0644,
674 .proc_handler = &proc_dointvec_jiffies, 674 .proc_handler = proc_dointvec_jiffies,
675 .strategy = &sysctl_jiffies 675 .strategy = sysctl_jiffies
676 }, 676 },
677 { } 677 { }
678}; 678};
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d69fa462d3f0..4d40dc214b2d 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2499,7 +2499,7 @@ ctl_table ipv6_route_table_template[] = {
2499 .data = &init_net.ipv6.sysctl.flush_delay, 2499 .data = &init_net.ipv6.sysctl.flush_delay,
2500 .maxlen = sizeof(int), 2500 .maxlen = sizeof(int),
2501 .mode = 0200, 2501 .mode = 0200,
2502 .proc_handler = &ipv6_sysctl_rtcache_flush 2502 .proc_handler = ipv6_sysctl_rtcache_flush
2503 }, 2503 },
2504 { 2504 {
2505 .ctl_name = NET_IPV6_ROUTE_GC_THRESH, 2505 .ctl_name = NET_IPV6_ROUTE_GC_THRESH,
@@ -2507,7 +2507,7 @@ ctl_table ipv6_route_table_template[] = {
2507 .data = &ip6_dst_ops_template.gc_thresh, 2507 .data = &ip6_dst_ops_template.gc_thresh,
2508 .maxlen = sizeof(int), 2508 .maxlen = sizeof(int),
2509 .mode = 0644, 2509 .mode = 0644,
2510 .proc_handler = &proc_dointvec, 2510 .proc_handler = proc_dointvec,
2511 }, 2511 },
2512 { 2512 {
2513 .ctl_name = NET_IPV6_ROUTE_MAX_SIZE, 2513 .ctl_name = NET_IPV6_ROUTE_MAX_SIZE,
@@ -2515,7 +2515,7 @@ ctl_table ipv6_route_table_template[] = {
2515 .data = &init_net.ipv6.sysctl.ip6_rt_max_size, 2515 .data = &init_net.ipv6.sysctl.ip6_rt_max_size,
2516 .maxlen = sizeof(int), 2516 .maxlen = sizeof(int),
2517 .mode = 0644, 2517 .mode = 0644,
2518 .proc_handler = &proc_dointvec, 2518 .proc_handler = proc_dointvec,
2519 }, 2519 },
2520 { 2520 {
2521 .ctl_name = NET_IPV6_ROUTE_GC_MIN_INTERVAL, 2521 .ctl_name = NET_IPV6_ROUTE_GC_MIN_INTERVAL,
@@ -2523,8 +2523,8 @@ ctl_table ipv6_route_table_template[] = {
2523 .data = &init_net.ipv6.sysctl.ip6_rt_gc_min_interval, 2523 .data = &init_net.ipv6.sysctl.ip6_rt_gc_min_interval,
2524 .maxlen = sizeof(int), 2524 .maxlen = sizeof(int),
2525 .mode = 0644, 2525 .mode = 0644,
2526 .proc_handler = &proc_dointvec_jiffies, 2526 .proc_handler = proc_dointvec_jiffies,
2527 .strategy = &sysctl_jiffies, 2527 .strategy = sysctl_jiffies,
2528 }, 2528 },
2529 { 2529 {
2530 .ctl_name = NET_IPV6_ROUTE_GC_TIMEOUT, 2530 .ctl_name = NET_IPV6_ROUTE_GC_TIMEOUT,
@@ -2532,8 +2532,8 @@ ctl_table ipv6_route_table_template[] = {
2532 .data = &init_net.ipv6.sysctl.ip6_rt_gc_timeout, 2532 .data = &init_net.ipv6.sysctl.ip6_rt_gc_timeout,
2533 .maxlen = sizeof(int), 2533 .maxlen = sizeof(int),
2534 .mode = 0644, 2534 .mode = 0644,
2535 .proc_handler = &proc_dointvec_jiffies, 2535 .proc_handler = proc_dointvec_jiffies,
2536 .strategy = &sysctl_jiffies, 2536 .strategy = sysctl_jiffies,
2537 }, 2537 },
2538 { 2538 {
2539 .ctl_name = NET_IPV6_ROUTE_GC_INTERVAL, 2539 .ctl_name = NET_IPV6_ROUTE_GC_INTERVAL,
@@ -2541,8 +2541,8 @@ ctl_table ipv6_route_table_template[] = {
2541 .data = &init_net.ipv6.sysctl.ip6_rt_gc_interval, 2541 .data = &init_net.ipv6.sysctl.ip6_rt_gc_interval,
2542 .maxlen = sizeof(int), 2542 .maxlen = sizeof(int),
2543 .mode = 0644, 2543 .mode = 0644,
2544 .proc_handler = &proc_dointvec_jiffies, 2544 .proc_handler = proc_dointvec_jiffies,
2545 .strategy = &sysctl_jiffies, 2545 .strategy = sysctl_jiffies,
2546 }, 2546 },
2547 { 2547 {
2548 .ctl_name = NET_IPV6_ROUTE_GC_ELASTICITY, 2548 .ctl_name = NET_IPV6_ROUTE_GC_ELASTICITY,
@@ -2550,8 +2550,8 @@ ctl_table ipv6_route_table_template[] = {
2550 .data = &init_net.ipv6.sysctl.ip6_rt_gc_elasticity, 2550 .data = &init_net.ipv6.sysctl.ip6_rt_gc_elasticity,
2551 .maxlen = sizeof(int), 2551 .maxlen = sizeof(int),
2552 .mode = 0644, 2552 .mode = 0644,
2553 .proc_handler = &proc_dointvec_jiffies, 2553 .proc_handler = proc_dointvec_jiffies,
2554 .strategy = &sysctl_jiffies, 2554 .strategy = sysctl_jiffies,
2555 }, 2555 },
2556 { 2556 {
2557 .ctl_name = NET_IPV6_ROUTE_MTU_EXPIRES, 2557 .ctl_name = NET_IPV6_ROUTE_MTU_EXPIRES,
@@ -2559,8 +2559,8 @@ ctl_table ipv6_route_table_template[] = {
2559 .data = &init_net.ipv6.sysctl.ip6_rt_mtu_expires, 2559 .data = &init_net.ipv6.sysctl.ip6_rt_mtu_expires,
2560 .maxlen = sizeof(int), 2560 .maxlen = sizeof(int),
2561 .mode = 0644, 2561 .mode = 0644,
2562 .proc_handler = &proc_dointvec_jiffies, 2562 .proc_handler = proc_dointvec_jiffies,
2563 .strategy = &sysctl_jiffies, 2563 .strategy = sysctl_jiffies,
2564 }, 2564 },
2565 { 2565 {
2566 .ctl_name = NET_IPV6_ROUTE_MIN_ADVMSS, 2566 .ctl_name = NET_IPV6_ROUTE_MIN_ADVMSS,
@@ -2568,8 +2568,8 @@ ctl_table ipv6_route_table_template[] = {
2568 .data = &init_net.ipv6.sysctl.ip6_rt_min_advmss, 2568 .data = &init_net.ipv6.sysctl.ip6_rt_min_advmss,
2569 .maxlen = sizeof(int), 2569 .maxlen = sizeof(int),
2570 .mode = 0644, 2570 .mode = 0644,
2571 .proc_handler = &proc_dointvec_jiffies, 2571 .proc_handler = proc_dointvec_jiffies,
2572 .strategy = &sysctl_jiffies, 2572 .strategy = sysctl_jiffies,
2573 }, 2573 },
2574 { 2574 {
2575 .ctl_name = NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS, 2575 .ctl_name = NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS,
@@ -2577,8 +2577,8 @@ ctl_table ipv6_route_table_template[] = {
2577 .data = &init_net.ipv6.sysctl.ip6_rt_gc_min_interval, 2577 .data = &init_net.ipv6.sysctl.ip6_rt_gc_min_interval,
2578 .maxlen = sizeof(int), 2578 .maxlen = sizeof(int),
2579 .mode = 0644, 2579 .mode = 0644,
2580 .proc_handler = &proc_dointvec_ms_jiffies, 2580 .proc_handler = proc_dointvec_ms_jiffies,
2581 .strategy = &sysctl_ms_jiffies, 2581 .strategy = sysctl_ms_jiffies,
2582 }, 2582 },
2583 { .ctl_name = 0 } 2583 { .ctl_name = 0 }
2584}; 2584};
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 587f8f60c489..9048fe7e7ea7 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -35,7 +35,7 @@ static ctl_table ipv6_table_template[] = {
35 .data = &init_net.ipv6.sysctl.bindv6only, 35 .data = &init_net.ipv6.sysctl.bindv6only,
36 .maxlen = sizeof(int), 36 .maxlen = sizeof(int),
37 .mode = 0644, 37 .mode = 0644,
38 .proc_handler = &proc_dointvec 38 .proc_handler = proc_dointvec
39 }, 39 },
40 { .ctl_name = 0 } 40 { .ctl_name = 0 }
41}; 41};
@@ -47,7 +47,7 @@ static ctl_table ipv6_table[] = {
47 .data = &sysctl_mld_max_msf, 47 .data = &sysctl_mld_max_msf,
48 .maxlen = sizeof(int), 48 .maxlen = sizeof(int),
49 .mode = 0644, 49 .mode = 0644,
50 .proc_handler = &proc_dointvec 50 .proc_handler = proc_dointvec
51 }, 51 },
52 { .ctl_name = 0 } 52 { .ctl_name = 0 }
53}; 53};
diff --git a/net/ipx/sysctl_net_ipx.c b/net/ipx/sysctl_net_ipx.c
index 92fef864e852..633fcab35580 100644
--- a/net/ipx/sysctl_net_ipx.c
+++ b/net/ipx/sysctl_net_ipx.c
@@ -23,7 +23,7 @@ static struct ctl_table ipx_table[] = {
23 .data = &sysctl_ipx_pprop_broadcasting, 23 .data = &sysctl_ipx_pprop_broadcasting,
24 .maxlen = sizeof(int), 24 .maxlen = sizeof(int),
25 .mode = 0644, 25 .mode = 0644,
26 .proc_handler = &proc_dointvec, 26 .proc_handler = proc_dointvec,
27 }, 27 },
28 { 0 }, 28 { 0 },
29}; 29};
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index 9ab3df15425d..57f8817c3979 100644
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -118,8 +118,8 @@ static ctl_table irda_table[] = {
118 .data = &sysctl_discovery, 118 .data = &sysctl_discovery,
119 .maxlen = sizeof(int), 119 .maxlen = sizeof(int),
120 .mode = 0644, 120 .mode = 0644,
121 .proc_handler = &do_discovery, 121 .proc_handler = do_discovery,
122 .strategy = &sysctl_intvec 122 .strategy = sysctl_intvec
123 }, 123 },
124 { 124 {
125 .ctl_name = NET_IRDA_DEVNAME, 125 .ctl_name = NET_IRDA_DEVNAME,
@@ -127,8 +127,8 @@ static ctl_table irda_table[] = {
127 .data = sysctl_devname, 127 .data = sysctl_devname,
128 .maxlen = 65, 128 .maxlen = 65,
129 .mode = 0644, 129 .mode = 0644,
130 .proc_handler = &do_devname, 130 .proc_handler = do_devname,
131 .strategy = &sysctl_string 131 .strategy = sysctl_string
132 }, 132 },
133#ifdef CONFIG_IRDA_DEBUG 133#ifdef CONFIG_IRDA_DEBUG
134 { 134 {
@@ -137,7 +137,7 @@ static ctl_table irda_table[] = {
137 .data = &irda_debug, 137 .data = &irda_debug,
138 .maxlen = sizeof(int), 138 .maxlen = sizeof(int),
139 .mode = 0644, 139 .mode = 0644,
140 .proc_handler = &proc_dointvec 140 .proc_handler = proc_dointvec
141 }, 141 },
142#endif 142#endif
143#ifdef CONFIG_IRDA_FAST_RR 143#ifdef CONFIG_IRDA_FAST_RR
@@ -147,7 +147,7 @@ static ctl_table irda_table[] = {
147 .data = &sysctl_fast_poll_increase, 147 .data = &sysctl_fast_poll_increase,
148 .maxlen = sizeof(int), 148 .maxlen = sizeof(int),
149 .mode = 0644, 149 .mode = 0644,
150 .proc_handler = &proc_dointvec 150 .proc_handler = proc_dointvec
151 }, 151 },
152#endif 152#endif
153 { 153 {
@@ -156,8 +156,8 @@ static ctl_table irda_table[] = {
156 .data = &sysctl_discovery_slots, 156 .data = &sysctl_discovery_slots,
157 .maxlen = sizeof(int), 157 .maxlen = sizeof(int),
158 .mode = 0644, 158 .mode = 0644,
159 .proc_handler = &proc_dointvec_minmax, 159 .proc_handler = proc_dointvec_minmax,
160 .strategy = &sysctl_intvec, 160 .strategy = sysctl_intvec,
161 .extra1 = &min_discovery_slots, 161 .extra1 = &min_discovery_slots,
162 .extra2 = &max_discovery_slots 162 .extra2 = &max_discovery_slots
163 }, 163 },
@@ -167,7 +167,7 @@ static ctl_table irda_table[] = {
167 .data = &sysctl_discovery_timeout, 167 .data = &sysctl_discovery_timeout,
168 .maxlen = sizeof(int), 168 .maxlen = sizeof(int),
169 .mode = 0644, 169 .mode = 0644,
170 .proc_handler = &proc_dointvec 170 .proc_handler = proc_dointvec
171 }, 171 },
172 { 172 {
173 .ctl_name = NET_IRDA_SLOT_TIMEOUT, 173 .ctl_name = NET_IRDA_SLOT_TIMEOUT,
@@ -175,8 +175,8 @@ static ctl_table irda_table[] = {
175 .data = &sysctl_slot_timeout, 175 .data = &sysctl_slot_timeout,
176 .maxlen = sizeof(int), 176 .maxlen = sizeof(int),
177 .mode = 0644, 177 .mode = 0644,
178 .proc_handler = &proc_dointvec_minmax, 178 .proc_handler = proc_dointvec_minmax,
179 .strategy = &sysctl_intvec, 179 .strategy = sysctl_intvec,
180 .extra1 = &min_slot_timeout, 180 .extra1 = &min_slot_timeout,
181 .extra2 = &max_slot_timeout 181 .extra2 = &max_slot_timeout
182 }, 182 },
@@ -186,8 +186,8 @@ static ctl_table irda_table[] = {
186 .data = &sysctl_max_baud_rate, 186 .data = &sysctl_max_baud_rate,
187 .maxlen = sizeof(int), 187 .maxlen = sizeof(int),
188 .mode = 0644, 188 .mode = 0644,
189 .proc_handler = &proc_dointvec_minmax, 189 .proc_handler = proc_dointvec_minmax,
190 .strategy = &sysctl_intvec, 190 .strategy = sysctl_intvec,
191 .extra1 = &min_max_baud_rate, 191 .extra1 = &min_max_baud_rate,
192 .extra2 = &max_max_baud_rate 192 .extra2 = &max_max_baud_rate
193 }, 193 },
@@ -197,8 +197,8 @@ static ctl_table irda_table[] = {
197 .data = &sysctl_min_tx_turn_time, 197 .data = &sysctl_min_tx_turn_time,
198 .maxlen = sizeof(int), 198 .maxlen = sizeof(int),
199 .mode = 0644, 199 .mode = 0644,
200 .proc_handler = &proc_dointvec_minmax, 200 .proc_handler = proc_dointvec_minmax,
201 .strategy = &sysctl_intvec, 201 .strategy = sysctl_intvec,
202 .extra1 = &min_min_tx_turn_time, 202 .extra1 = &min_min_tx_turn_time,
203 .extra2 = &max_min_tx_turn_time 203 .extra2 = &max_min_tx_turn_time
204 }, 204 },
@@ -208,8 +208,8 @@ static ctl_table irda_table[] = {
208 .data = &sysctl_max_tx_data_size, 208 .data = &sysctl_max_tx_data_size,
209 .maxlen = sizeof(int), 209 .maxlen = sizeof(int),
210 .mode = 0644, 210 .mode = 0644,
211 .proc_handler = &proc_dointvec_minmax, 211 .proc_handler = proc_dointvec_minmax,
212 .strategy = &sysctl_intvec, 212 .strategy = sysctl_intvec,
213 .extra1 = &min_max_tx_data_size, 213 .extra1 = &min_max_tx_data_size,
214 .extra2 = &max_max_tx_data_size 214 .extra2 = &max_max_tx_data_size
215 }, 215 },
@@ -219,8 +219,8 @@ static ctl_table irda_table[] = {
219 .data = &sysctl_max_tx_window, 219 .data = &sysctl_max_tx_window,
220 .maxlen = sizeof(int), 220 .maxlen = sizeof(int),
221 .mode = 0644, 221 .mode = 0644,
222 .proc_handler = &proc_dointvec_minmax, 222 .proc_handler = proc_dointvec_minmax,
223 .strategy = &sysctl_intvec, 223 .strategy = sysctl_intvec,
224 .extra1 = &min_max_tx_window, 224 .extra1 = &min_max_tx_window,
225 .extra2 = &max_max_tx_window 225 .extra2 = &max_max_tx_window
226 }, 226 },
@@ -230,8 +230,8 @@ static ctl_table irda_table[] = {
230 .data = &sysctl_max_noreply_time, 230 .data = &sysctl_max_noreply_time,
231 .maxlen = sizeof(int), 231 .maxlen = sizeof(int),
232 .mode = 0644, 232 .mode = 0644,
233 .proc_handler = &proc_dointvec_minmax, 233 .proc_handler = proc_dointvec_minmax,
234 .strategy = &sysctl_intvec, 234 .strategy = sysctl_intvec,
235 .extra1 = &min_max_noreply_time, 235 .extra1 = &min_max_noreply_time,
236 .extra2 = &max_max_noreply_time 236 .extra2 = &max_max_noreply_time
237 }, 237 },
@@ -241,8 +241,8 @@ static ctl_table irda_table[] = {
241 .data = &sysctl_warn_noreply_time, 241 .data = &sysctl_warn_noreply_time,
242 .maxlen = sizeof(int), 242 .maxlen = sizeof(int),
243 .mode = 0644, 243 .mode = 0644,
244 .proc_handler = &proc_dointvec_minmax, 244 .proc_handler = proc_dointvec_minmax,
245 .strategy = &sysctl_intvec, 245 .strategy = sysctl_intvec,
246 .extra1 = &min_warn_noreply_time, 246 .extra1 = &min_warn_noreply_time,
247 .extra2 = &max_warn_noreply_time 247 .extra2 = &max_warn_noreply_time
248 }, 248 },
@@ -252,8 +252,8 @@ static ctl_table irda_table[] = {
252 .data = &sysctl_lap_keepalive_time, 252 .data = &sysctl_lap_keepalive_time,
253 .maxlen = sizeof(int), 253 .maxlen = sizeof(int),
254 .mode = 0644, 254 .mode = 0644,
255 .proc_handler = &proc_dointvec_minmax, 255 .proc_handler = proc_dointvec_minmax,
256 .strategy = &sysctl_intvec, 256 .strategy = sysctl_intvec,
257 .extra1 = &min_lap_keepalive_time, 257 .extra1 = &min_lap_keepalive_time,
258 .extra2 = &max_lap_keepalive_time 258 .extra2 = &max_lap_keepalive_time
259 }, 259 },
diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c
index 5bef1dcf18e3..57b9304d444c 100644
--- a/net/llc/sysctl_net_llc.c
+++ b/net/llc/sysctl_net_llc.c
@@ -20,8 +20,8 @@ static struct ctl_table llc2_timeout_table[] = {
20 .data = &sysctl_llc2_ack_timeout, 20 .data = &sysctl_llc2_ack_timeout,
21 .maxlen = sizeof(long), 21 .maxlen = sizeof(long),
22 .mode = 0644, 22 .mode = 0644,
23 .proc_handler = &proc_dointvec_jiffies, 23 .proc_handler = proc_dointvec_jiffies,
24 .strategy = &sysctl_jiffies, 24 .strategy = sysctl_jiffies,
25 }, 25 },
26 { 26 {
27 .ctl_name = NET_LLC2_BUSY_TIMEOUT, 27 .ctl_name = NET_LLC2_BUSY_TIMEOUT,
@@ -29,8 +29,8 @@ static struct ctl_table llc2_timeout_table[] = {
29 .data = &sysctl_llc2_busy_timeout, 29 .data = &sysctl_llc2_busy_timeout,
30 .maxlen = sizeof(long), 30 .maxlen = sizeof(long),
31 .mode = 0644, 31 .mode = 0644,
32 .proc_handler = &proc_dointvec_jiffies, 32 .proc_handler = proc_dointvec_jiffies,
33 .strategy = &sysctl_jiffies, 33 .strategy = sysctl_jiffies,
34 }, 34 },
35 { 35 {
36 .ctl_name = NET_LLC2_P_TIMEOUT, 36 .ctl_name = NET_LLC2_P_TIMEOUT,
@@ -38,8 +38,8 @@ static struct ctl_table llc2_timeout_table[] = {
38 .data = &sysctl_llc2_p_timeout, 38 .data = &sysctl_llc2_p_timeout,
39 .maxlen = sizeof(long), 39 .maxlen = sizeof(long),
40 .mode = 0644, 40 .mode = 0644,
41 .proc_handler = &proc_dointvec_jiffies, 41 .proc_handler = proc_dointvec_jiffies,
42 .strategy = &sysctl_jiffies, 42 .strategy = sysctl_jiffies,
43 }, 43 },
44 { 44 {
45 .ctl_name = NET_LLC2_REJ_TIMEOUT, 45 .ctl_name = NET_LLC2_REJ_TIMEOUT,
@@ -47,8 +47,8 @@ static struct ctl_table llc2_timeout_table[] = {
47 .data = &sysctl_llc2_rej_timeout, 47 .data = &sysctl_llc2_rej_timeout,
48 .maxlen = sizeof(long), 48 .maxlen = sizeof(long),
49 .mode = 0644, 49 .mode = 0644,
50 .proc_handler = &proc_dointvec_jiffies, 50 .proc_handler = proc_dointvec_jiffies,
51 .strategy = &sysctl_jiffies, 51 .strategy = sysctl_jiffies,
52 }, 52 },
53 { 0 }, 53 { 0 },
54}; 54};
@@ -60,8 +60,8 @@ static struct ctl_table llc_station_table[] = {
60 .data = &sysctl_llc_station_ack_timeout, 60 .data = &sysctl_llc_station_ack_timeout,
61 .maxlen = sizeof(long), 61 .maxlen = sizeof(long),
62 .mode = 0644, 62 .mode = 0644,
63 .proc_handler = &proc_dointvec_jiffies, 63 .proc_handler = proc_dointvec_jiffies,
64 .strategy = &sysctl_jiffies, 64 .strategy = sysctl_jiffies,
65 }, 65 },
66 { 0 }, 66 { 0 },
67}; 67};
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index d0ccdaff4276..e01061f49cdc 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1545,7 +1545,7 @@ static struct ctl_table vs_vars[] = {
1545 .data = &sysctl_ip_vs_amemthresh, 1545 .data = &sysctl_ip_vs_amemthresh,
1546 .maxlen = sizeof(int), 1546 .maxlen = sizeof(int),
1547 .mode = 0644, 1547 .mode = 0644,
1548 .proc_handler = &proc_dointvec, 1548 .proc_handler = proc_dointvec,
1549 }, 1549 },
1550#ifdef CONFIG_IP_VS_DEBUG 1550#ifdef CONFIG_IP_VS_DEBUG
1551 { 1551 {
@@ -1553,7 +1553,7 @@ static struct ctl_table vs_vars[] = {
1553 .data = &sysctl_ip_vs_debug_level, 1553 .data = &sysctl_ip_vs_debug_level,
1554 .maxlen = sizeof(int), 1554 .maxlen = sizeof(int),
1555 .mode = 0644, 1555 .mode = 0644,
1556 .proc_handler = &proc_dointvec, 1556 .proc_handler = proc_dointvec,
1557 }, 1557 },
1558#endif 1558#endif
1559 { 1559 {
@@ -1561,28 +1561,28 @@ static struct ctl_table vs_vars[] = {
1561 .data = &sysctl_ip_vs_am_droprate, 1561 .data = &sysctl_ip_vs_am_droprate,
1562 .maxlen = sizeof(int), 1562 .maxlen = sizeof(int),
1563 .mode = 0644, 1563 .mode = 0644,
1564 .proc_handler = &proc_dointvec, 1564 .proc_handler = proc_dointvec,
1565 }, 1565 },
1566 { 1566 {
1567 .procname = "drop_entry", 1567 .procname = "drop_entry",
1568 .data = &sysctl_ip_vs_drop_entry, 1568 .data = &sysctl_ip_vs_drop_entry,
1569 .maxlen = sizeof(int), 1569 .maxlen = sizeof(int),
1570 .mode = 0644, 1570 .mode = 0644,
1571 .proc_handler = &proc_do_defense_mode, 1571 .proc_handler = proc_do_defense_mode,
1572 }, 1572 },
1573 { 1573 {
1574 .procname = "drop_packet", 1574 .procname = "drop_packet",
1575 .data = &sysctl_ip_vs_drop_packet, 1575 .data = &sysctl_ip_vs_drop_packet,
1576 .maxlen = sizeof(int), 1576 .maxlen = sizeof(int),
1577 .mode = 0644, 1577 .mode = 0644,
1578 .proc_handler = &proc_do_defense_mode, 1578 .proc_handler = proc_do_defense_mode,
1579 }, 1579 },
1580 { 1580 {
1581 .procname = "secure_tcp", 1581 .procname = "secure_tcp",
1582 .data = &sysctl_ip_vs_secure_tcp, 1582 .data = &sysctl_ip_vs_secure_tcp,
1583 .maxlen = sizeof(int), 1583 .maxlen = sizeof(int),
1584 .mode = 0644, 1584 .mode = 0644,
1585 .proc_handler = &proc_do_defense_mode, 1585 .proc_handler = proc_do_defense_mode,
1586 }, 1586 },
1587#if 0 1587#if 0
1588 { 1588 {
@@ -1590,84 +1590,84 @@ static struct ctl_table vs_vars[] = {
1590 .data = &vs_timeout_table_dos.timeout[IP_VS_S_ESTABLISHED], 1590 .data = &vs_timeout_table_dos.timeout[IP_VS_S_ESTABLISHED],
1591 .maxlen = sizeof(int), 1591 .maxlen = sizeof(int),
1592 .mode = 0644, 1592 .mode = 0644,
1593 .proc_handler = &proc_dointvec_jiffies, 1593 .proc_handler = proc_dointvec_jiffies,
1594 }, 1594 },
1595 { 1595 {
1596 .procname = "timeout_synsent", 1596 .procname = "timeout_synsent",
1597 .data = &vs_timeout_table_dos.timeout[IP_VS_S_SYN_SENT], 1597 .data = &vs_timeout_table_dos.timeout[IP_VS_S_SYN_SENT],
1598 .maxlen = sizeof(int), 1598 .maxlen = sizeof(int),
1599 .mode = 0644, 1599 .mode = 0644,
1600 .proc_handler = &proc_dointvec_jiffies, 1600 .proc_handler = proc_dointvec_jiffies,
1601 }, 1601 },
1602 { 1602 {
1603 .procname = "timeout_synrecv", 1603 .procname = "timeout_synrecv",
1604 .data = &vs_timeout_table_dos.timeout[IP_VS_S_SYN_RECV], 1604 .data = &vs_timeout_table_dos.timeout[IP_VS_S_SYN_RECV],
1605 .maxlen = sizeof(int), 1605 .maxlen = sizeof(int),
1606 .mode = 0644, 1606 .mode = 0644,
1607 .proc_handler = &proc_dointvec_jiffies, 1607 .proc_handler = proc_dointvec_jiffies,
1608 }, 1608 },
1609 { 1609 {
1610 .procname = "timeout_finwait", 1610 .procname = "timeout_finwait",
1611 .data = &vs_timeout_table_dos.timeout[IP_VS_S_FIN_WAIT], 1611 .data = &vs_timeout_table_dos.timeout[IP_VS_S_FIN_WAIT],
1612 .maxlen = sizeof(int), 1612 .maxlen = sizeof(int),
1613 .mode = 0644, 1613 .mode = 0644,
1614 .proc_handler = &proc_dointvec_jiffies, 1614 .proc_handler = proc_dointvec_jiffies,
1615 }, 1615 },
1616 { 1616 {
1617 .procname = "timeout_timewait", 1617 .procname = "timeout_timewait",
1618 .data = &vs_timeout_table_dos.timeout[IP_VS_S_TIME_WAIT], 1618 .data = &vs_timeout_table_dos.timeout[IP_VS_S_TIME_WAIT],
1619 .maxlen = sizeof(int), 1619 .maxlen = sizeof(int),
1620 .mode = 0644, 1620 .mode = 0644,
1621 .proc_handler = &proc_dointvec_jiffies, 1621 .proc_handler = proc_dointvec_jiffies,
1622 }, 1622 },
1623 { 1623 {
1624 .procname = "timeout_close", 1624 .procname = "timeout_close",
1625 .data = &vs_timeout_table_dos.timeout[IP_VS_S_CLOSE], 1625 .data = &vs_timeout_table_dos.timeout[IP_VS_S_CLOSE],
1626 .maxlen = sizeof(int), 1626 .maxlen = sizeof(int),
1627 .mode = 0644, 1627 .mode = 0644,
1628 .proc_handler = &proc_dointvec_jiffies, 1628 .proc_handler = proc_dointvec_jiffies,
1629 }, 1629 },
1630 { 1630 {
1631 .procname = "timeout_closewait", 1631 .procname = "timeout_closewait",
1632 .data = &vs_timeout_table_dos.timeout[IP_VS_S_CLOSE_WAIT], 1632 .data = &vs_timeout_table_dos.timeout[IP_VS_S_CLOSE_WAIT],
1633 .maxlen = sizeof(int), 1633 .maxlen = sizeof(int),
1634 .mode = 0644, 1634 .mode = 0644,
1635 .proc_handler = &proc_dointvec_jiffies, 1635 .proc_handler = proc_dointvec_jiffies,
1636 }, 1636 },
1637 { 1637 {
1638 .procname = "timeout_lastack", 1638 .procname = "timeout_lastack",
1639 .data = &vs_timeout_table_dos.timeout[IP_VS_S_LAST_ACK], 1639 .data = &vs_timeout_table_dos.timeout[IP_VS_S_LAST_ACK],
1640 .maxlen = sizeof(int), 1640 .maxlen = sizeof(int),
1641 .mode = 0644, 1641 .mode = 0644,
1642 .proc_handler = &proc_dointvec_jiffies, 1642 .proc_handler = proc_dointvec_jiffies,
1643 }, 1643 },
1644 { 1644 {
1645 .procname = "timeout_listen", 1645 .procname = "timeout_listen",
1646 .data = &vs_timeout_table_dos.timeout[IP_VS_S_LISTEN], 1646 .data = &vs_timeout_table_dos.timeout[IP_VS_S_LISTEN],
1647 .maxlen = sizeof(int), 1647 .maxlen = sizeof(int),
1648 .mode = 0644, 1648 .mode = 0644,
1649 .proc_handler = &proc_dointvec_jiffies, 1649 .proc_handler = proc_dointvec_jiffies,
1650 }, 1650 },
1651 { 1651 {
1652 .procname = "timeout_synack", 1652 .procname = "timeout_synack",
1653 .data = &vs_timeout_table_dos.timeout[IP_VS_S_SYNACK], 1653 .data = &vs_timeout_table_dos.timeout[IP_VS_S_SYNACK],
1654 .maxlen = sizeof(int), 1654 .maxlen = sizeof(int),
1655 .mode = 0644, 1655 .mode = 0644,
1656 .proc_handler = &proc_dointvec_jiffies, 1656 .proc_handler = proc_dointvec_jiffies,
1657 }, 1657 },
1658 { 1658 {
1659 .procname = "timeout_udp", 1659 .procname = "timeout_udp",
1660 .data = &vs_timeout_table_dos.timeout[IP_VS_S_UDP], 1660 .data = &vs_timeout_table_dos.timeout[IP_VS_S_UDP],
1661 .maxlen = sizeof(int), 1661 .maxlen = sizeof(int),
1662 .mode = 0644, 1662 .mode = 0644,
1663 .proc_handler = &proc_dointvec_jiffies, 1663 .proc_handler = proc_dointvec_jiffies,
1664 }, 1664 },
1665 { 1665 {
1666 .procname = "timeout_icmp", 1666 .procname = "timeout_icmp",
1667 .data = &vs_timeout_table_dos.timeout[IP_VS_S_ICMP], 1667 .data = &vs_timeout_table_dos.timeout[IP_VS_S_ICMP],
1668 .maxlen = sizeof(int), 1668 .maxlen = sizeof(int),
1669 .mode = 0644, 1669 .mode = 0644,
1670 .proc_handler = &proc_dointvec_jiffies, 1670 .proc_handler = proc_dointvec_jiffies,
1671 }, 1671 },
1672#endif 1672#endif
1673 { 1673 {
@@ -1675,35 +1675,35 @@ static struct ctl_table vs_vars[] = {
1675 .data = &sysctl_ip_vs_cache_bypass, 1675 .data = &sysctl_ip_vs_cache_bypass,
1676 .maxlen = sizeof(int), 1676 .maxlen = sizeof(int),
1677 .mode = 0644, 1677 .mode = 0644,
1678 .proc_handler = &proc_dointvec, 1678 .proc_handler = proc_dointvec,
1679 }, 1679 },
1680 { 1680 {
1681 .procname = "expire_nodest_conn", 1681 .procname = "expire_nodest_conn",
1682 .data = &sysctl_ip_vs_expire_nodest_conn, 1682 .data = &sysctl_ip_vs_expire_nodest_conn,
1683 .maxlen = sizeof(int), 1683 .maxlen = sizeof(int),
1684 .mode = 0644, 1684 .mode = 0644,
1685 .proc_handler = &proc_dointvec, 1685 .proc_handler = proc_dointvec,
1686 }, 1686 },
1687 { 1687 {
1688 .procname = "expire_quiescent_template", 1688 .procname = "expire_quiescent_template",
1689 .data = &sysctl_ip_vs_expire_quiescent_template, 1689 .data = &sysctl_ip_vs_expire_quiescent_template,
1690 .maxlen = sizeof(int), 1690 .maxlen = sizeof(int),
1691 .mode = 0644, 1691 .mode = 0644,
1692 .proc_handler = &proc_dointvec, 1692 .proc_handler = proc_dointvec,
1693 }, 1693 },
1694 { 1694 {
1695 .procname = "sync_threshold", 1695 .procname = "sync_threshold",
1696 .data = &sysctl_ip_vs_sync_threshold, 1696 .data = &sysctl_ip_vs_sync_threshold,
1697 .maxlen = sizeof(sysctl_ip_vs_sync_threshold), 1697 .maxlen = sizeof(sysctl_ip_vs_sync_threshold),
1698 .mode = 0644, 1698 .mode = 0644,
1699 .proc_handler = &proc_do_sync_threshold, 1699 .proc_handler = proc_do_sync_threshold,
1700 }, 1700 },
1701 { 1701 {
1702 .procname = "nat_icmp_send", 1702 .procname = "nat_icmp_send",
1703 .data = &sysctl_ip_vs_nat_icmp_send, 1703 .data = &sysctl_ip_vs_nat_icmp_send,
1704 .maxlen = sizeof(int), 1704 .maxlen = sizeof(int),
1705 .mode = 0644, 1705 .mode = 0644,
1706 .proc_handler = &proc_dointvec, 1706 .proc_handler = proc_dointvec,
1707 }, 1707 },
1708 { .ctl_name = 0 } 1708 { .ctl_name = 0 }
1709}; 1709};
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index 4256cfad8d31..9394f539966a 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -116,7 +116,7 @@ static ctl_table vs_vars_table[] = {
116 .data = &sysctl_ip_vs_lblc_expiration, 116 .data = &sysctl_ip_vs_lblc_expiration,
117 .maxlen = sizeof(int), 117 .maxlen = sizeof(int),
118 .mode = 0644, 118 .mode = 0644,
119 .proc_handler = &proc_dointvec_jiffies, 119 .proc_handler = proc_dointvec_jiffies,
120 }, 120 },
121 { .ctl_name = 0 } 121 { .ctl_name = 0 }
122}; 122};
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index 321b49fa41d8..92dc76a6842c 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -295,7 +295,7 @@ static ctl_table vs_vars_table[] = {
295 .data = &sysctl_ip_vs_lblcr_expiration, 295 .data = &sysctl_ip_vs_lblcr_expiration,
296 .maxlen = sizeof(int), 296 .maxlen = sizeof(int),
297 .mode = 0644, 297 .mode = 0644,
298 .proc_handler = &proc_dointvec_jiffies, 298 .proc_handler = proc_dointvec_jiffies,
299 }, 299 },
300 { .ctl_name = 0 } 300 { .ctl_name = 0 }
301}; 301};
diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
index b92df5c1dfcf..9fe8982bd7c9 100644
--- a/net/netfilter/nf_conntrack_acct.c
+++ b/net/netfilter/nf_conntrack_acct.c
@@ -35,7 +35,7 @@ static struct ctl_table acct_sysctl_table[] = {
35 .data = &init_net.ct.sysctl_acct, 35 .data = &init_net.ct.sysctl_acct,
36 .maxlen = sizeof(unsigned int), 36 .maxlen = sizeof(unsigned int),
37 .mode = 0644, 37 .mode = 0644,
38 .proc_handler = &proc_dointvec, 38 .proc_handler = proc_dointvec,
39 }, 39 },
40 {} 40 {}
41}; 41};
diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c
index dbe680af85d2..4be80d7b8795 100644
--- a/net/netfilter/nf_conntrack_proto_generic.c
+++ b/net/netfilter/nf_conntrack_proto_generic.c
@@ -67,7 +67,7 @@ static struct ctl_table generic_sysctl_table[] = {
67 .data = &nf_ct_generic_timeout, 67 .data = &nf_ct_generic_timeout,
68 .maxlen = sizeof(unsigned int), 68 .maxlen = sizeof(unsigned int),
69 .mode = 0644, 69 .mode = 0644,
70 .proc_handler = &proc_dointvec_jiffies, 70 .proc_handler = proc_dointvec_jiffies,
71 }, 71 },
72 { 72 {
73 .ctl_name = 0 73 .ctl_name = 0
@@ -80,7 +80,7 @@ static struct ctl_table generic_compat_sysctl_table[] = {
80 .data = &nf_ct_generic_timeout, 80 .data = &nf_ct_generic_timeout,
81 .maxlen = sizeof(unsigned int), 81 .maxlen = sizeof(unsigned int),
82 .mode = 0644, 82 .mode = 0644,
83 .proc_handler = &proc_dointvec_jiffies, 83 .proc_handler = proc_dointvec_jiffies,
84 }, 84 },
85 { 85 {
86 .ctl_name = 0 86 .ctl_name = 0
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index ae8c2609e230..c2bd457bc2f2 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -548,49 +548,49 @@ static struct ctl_table sctp_sysctl_table[] = {
548 .data = &sctp_timeouts[SCTP_CONNTRACK_CLOSED], 548 .data = &sctp_timeouts[SCTP_CONNTRACK_CLOSED],
549 .maxlen = sizeof(unsigned int), 549 .maxlen = sizeof(unsigned int),
550 .mode = 0644, 550 .mode = 0644,
551 .proc_handler = &proc_dointvec_jiffies, 551 .proc_handler = proc_dointvec_jiffies,
552 }, 552 },
553 { 553 {
554 .procname = "nf_conntrack_sctp_timeout_cookie_wait", 554 .procname = "nf_conntrack_sctp_timeout_cookie_wait",
555 .data = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_WAIT], 555 .data = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_WAIT],
556 .maxlen = sizeof(unsigned int), 556 .maxlen = sizeof(unsigned int),
557 .mode = 0644, 557 .mode = 0644,
558 .proc_handler = &proc_dointvec_jiffies, 558 .proc_handler = proc_dointvec_jiffies,
559 }, 559 },
560 { 560 {
561 .procname = "nf_conntrack_sctp_timeout_cookie_echoed", 561 .procname = "nf_conntrack_sctp_timeout_cookie_echoed",
562 .data = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_ECHOED], 562 .data = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_ECHOED],
563 .maxlen = sizeof(unsigned int), 563 .maxlen = sizeof(unsigned int),
564 .mode = 0644, 564 .mode = 0644,
565 .proc_handler = &proc_dointvec_jiffies, 565 .proc_handler = proc_dointvec_jiffies,
566 }, 566 },
567 { 567 {
568 .procname = "nf_conntrack_sctp_timeout_established", 568 .procname = "nf_conntrack_sctp_timeout_established",
569 .data = &sctp_timeouts[SCTP_CONNTRACK_ESTABLISHED], 569 .data = &sctp_timeouts[SCTP_CONNTRACK_ESTABLISHED],
570 .maxlen = sizeof(unsigned int), 570 .maxlen = sizeof(unsigned int),
571 .mode = 0644, 571 .mode = 0644,
572 .proc_handler = &proc_dointvec_jiffies, 572 .proc_handler = proc_dointvec_jiffies,
573 }, 573 },
574 { 574 {
575 .procname = "nf_conntrack_sctp_timeout_shutdown_sent", 575 .procname = "nf_conntrack_sctp_timeout_shutdown_sent",
576 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_SENT], 576 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_SENT],
577 .maxlen = sizeof(unsigned int), 577 .maxlen = sizeof(unsigned int),
578 .mode = 0644, 578 .mode = 0644,
579 .proc_handler = &proc_dointvec_jiffies, 579 .proc_handler = proc_dointvec_jiffies,
580 }, 580 },
581 { 581 {
582 .procname = "nf_conntrack_sctp_timeout_shutdown_recd", 582 .procname = "nf_conntrack_sctp_timeout_shutdown_recd",
583 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_RECD], 583 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_RECD],
584 .maxlen = sizeof(unsigned int), 584 .maxlen = sizeof(unsigned int),
585 .mode = 0644, 585 .mode = 0644,
586 .proc_handler = &proc_dointvec_jiffies, 586 .proc_handler = proc_dointvec_jiffies,
587 }, 587 },
588 { 588 {
589 .procname = "nf_conntrack_sctp_timeout_shutdown_ack_sent", 589 .procname = "nf_conntrack_sctp_timeout_shutdown_ack_sent",
590 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT], 590 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT],
591 .maxlen = sizeof(unsigned int), 591 .maxlen = sizeof(unsigned int),
592 .mode = 0644, 592 .mode = 0644,
593 .proc_handler = &proc_dointvec_jiffies, 593 .proc_handler = proc_dointvec_jiffies,
594 }, 594 },
595 { 595 {
596 .ctl_name = 0 596 .ctl_name = 0
@@ -604,49 +604,49 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
604 .data = &sctp_timeouts[SCTP_CONNTRACK_CLOSED], 604 .data = &sctp_timeouts[SCTP_CONNTRACK_CLOSED],
605 .maxlen = sizeof(unsigned int), 605 .maxlen = sizeof(unsigned int),
606 .mode = 0644, 606 .mode = 0644,
607 .proc_handler = &proc_dointvec_jiffies, 607 .proc_handler = proc_dointvec_jiffies,
608 }, 608 },
609 { 609 {
610 .procname = "ip_conntrack_sctp_timeout_cookie_wait", 610 .procname = "ip_conntrack_sctp_timeout_cookie_wait",
611 .data = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_WAIT], 611 .data = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_WAIT],
612 .maxlen = sizeof(unsigned int), 612 .maxlen = sizeof(unsigned int),
613 .mode = 0644, 613 .mode = 0644,
614 .proc_handler = &proc_dointvec_jiffies, 614 .proc_handler = proc_dointvec_jiffies,
615 }, 615 },
616 { 616 {
617 .procname = "ip_conntrack_sctp_timeout_cookie_echoed", 617 .procname = "ip_conntrack_sctp_timeout_cookie_echoed",
618 .data = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_ECHOED], 618 .data = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_ECHOED],
619 .maxlen = sizeof(unsigned int), 619 .maxlen = sizeof(unsigned int),
620 .mode = 0644, 620 .mode = 0644,
621 .proc_handler = &proc_dointvec_jiffies, 621 .proc_handler = proc_dointvec_jiffies,
622 }, 622 },
623 { 623 {
624 .procname = "ip_conntrack_sctp_timeout_established", 624 .procname = "ip_conntrack_sctp_timeout_established",
625 .data = &sctp_timeouts[SCTP_CONNTRACK_ESTABLISHED], 625 .data = &sctp_timeouts[SCTP_CONNTRACK_ESTABLISHED],
626 .maxlen = sizeof(unsigned int), 626 .maxlen = sizeof(unsigned int),
627 .mode = 0644, 627 .mode = 0644,
628 .proc_handler = &proc_dointvec_jiffies, 628 .proc_handler = proc_dointvec_jiffies,
629 }, 629 },
630 { 630 {
631 .procname = "ip_conntrack_sctp_timeout_shutdown_sent", 631 .procname = "ip_conntrack_sctp_timeout_shutdown_sent",
632 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_SENT], 632 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_SENT],
633 .maxlen = sizeof(unsigned int), 633 .maxlen = sizeof(unsigned int),
634 .mode = 0644, 634 .mode = 0644,
635 .proc_handler = &proc_dointvec_jiffies, 635 .proc_handler = proc_dointvec_jiffies,
636 }, 636 },
637 { 637 {
638 .procname = "ip_conntrack_sctp_timeout_shutdown_recd", 638 .procname = "ip_conntrack_sctp_timeout_shutdown_recd",
639 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_RECD], 639 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_RECD],
640 .maxlen = sizeof(unsigned int), 640 .maxlen = sizeof(unsigned int),
641 .mode = 0644, 641 .mode = 0644,
642 .proc_handler = &proc_dointvec_jiffies, 642 .proc_handler = proc_dointvec_jiffies,
643 }, 643 },
644 { 644 {
645 .procname = "ip_conntrack_sctp_timeout_shutdown_ack_sent", 645 .procname = "ip_conntrack_sctp_timeout_shutdown_ack_sent",
646 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT], 646 .data = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT],
647 .maxlen = sizeof(unsigned int), 647 .maxlen = sizeof(unsigned int),
648 .mode = 0644, 648 .mode = 0644,
649 .proc_handler = &proc_dointvec_jiffies, 649 .proc_handler = proc_dointvec_jiffies,
650 }, 650 },
651 { 651 {
652 .ctl_name = 0 652 .ctl_name = 0
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index f947ec41e391..a1edb9c1adee 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -1192,70 +1192,70 @@ static struct ctl_table tcp_sysctl_table[] = {
1192 .data = &tcp_timeouts[TCP_CONNTRACK_SYN_SENT], 1192 .data = &tcp_timeouts[TCP_CONNTRACK_SYN_SENT],
1193 .maxlen = sizeof(unsigned int), 1193 .maxlen = sizeof(unsigned int),
1194 .mode = 0644, 1194 .mode = 0644,
1195 .proc_handler = &proc_dointvec_jiffies, 1195 .proc_handler = proc_dointvec_jiffies,
1196 }, 1196 },
1197 { 1197 {
1198 .procname = "nf_conntrack_tcp_timeout_syn_recv", 1198 .procname = "nf_conntrack_tcp_timeout_syn_recv",
1199 .data = &tcp_timeouts[TCP_CONNTRACK_SYN_RECV], 1199 .data = &tcp_timeouts[TCP_CONNTRACK_SYN_RECV],
1200 .maxlen = sizeof(unsigned int), 1200 .maxlen = sizeof(unsigned int),
1201 .mode = 0644, 1201 .mode = 0644,
1202 .proc_handler = &proc_dointvec_jiffies, 1202 .proc_handler = proc_dointvec_jiffies,
1203 }, 1203 },
1204 { 1204 {
1205 .procname = "nf_conntrack_tcp_timeout_established", 1205 .procname = "nf_conntrack_tcp_timeout_established",
1206 .data = &tcp_timeouts[TCP_CONNTRACK_ESTABLISHED], 1206 .data = &tcp_timeouts[TCP_CONNTRACK_ESTABLISHED],
1207 .maxlen = sizeof(unsigned int), 1207 .maxlen = sizeof(unsigned int),
1208 .mode = 0644, 1208 .mode = 0644,
1209 .proc_handler = &proc_dointvec_jiffies, 1209 .proc_handler = proc_dointvec_jiffies,
1210 }, 1210 },
1211 { 1211 {
1212 .procname = "nf_conntrack_tcp_timeout_fin_wait", 1212 .procname = "nf_conntrack_tcp_timeout_fin_wait",
1213 .data = &tcp_timeouts[TCP_CONNTRACK_FIN_WAIT], 1213 .data = &tcp_timeouts[TCP_CONNTRACK_FIN_WAIT],
1214 .maxlen = sizeof(unsigned int), 1214 .maxlen = sizeof(unsigned int),
1215 .mode = 0644, 1215 .mode = 0644,
1216 .proc_handler = &proc_dointvec_jiffies, 1216 .proc_handler = proc_dointvec_jiffies,
1217 }, 1217 },
1218 { 1218 {
1219 .procname = "nf_conntrack_tcp_timeout_close_wait", 1219 .procname = "nf_conntrack_tcp_timeout_close_wait",
1220 .data = &tcp_timeouts[TCP_CONNTRACK_CLOSE_WAIT], 1220 .data = &tcp_timeouts[TCP_CONNTRACK_CLOSE_WAIT],
1221 .maxlen = sizeof(unsigned int), 1221 .maxlen = sizeof(unsigned int),
1222 .mode = 0644, 1222 .mode = 0644,
1223 .proc_handler = &proc_dointvec_jiffies, 1223 .proc_handler = proc_dointvec_jiffies,
1224 }, 1224 },
1225 { 1225 {
1226 .procname = "nf_conntrack_tcp_timeout_last_ack", 1226 .procname = "nf_conntrack_tcp_timeout_last_ack",
1227 .data = &tcp_timeouts[TCP_CONNTRACK_LAST_ACK], 1227 .data = &tcp_timeouts[TCP_CONNTRACK_LAST_ACK],
1228 .maxlen = sizeof(unsigned int), 1228 .maxlen = sizeof(unsigned int),
1229 .mode = 0644, 1229 .mode = 0644,
1230 .proc_handler = &proc_dointvec_jiffies, 1230 .proc_handler = proc_dointvec_jiffies,
1231 }, 1231 },
1232 { 1232 {
1233 .procname = "nf_conntrack_tcp_timeout_time_wait", 1233 .procname = "nf_conntrack_tcp_timeout_time_wait",
1234 .data = &tcp_timeouts[TCP_CONNTRACK_TIME_WAIT], 1234 .data = &tcp_timeouts[TCP_CONNTRACK_TIME_WAIT],
1235 .maxlen = sizeof(unsigned int), 1235 .maxlen = sizeof(unsigned int),
1236 .mode = 0644, 1236 .mode = 0644,
1237 .proc_handler = &proc_dointvec_jiffies, 1237 .proc_handler = proc_dointvec_jiffies,
1238 }, 1238 },
1239 { 1239 {
1240 .procname = "nf_conntrack_tcp_timeout_close", 1240 .procname = "nf_conntrack_tcp_timeout_close",
1241 .data = &tcp_timeouts[TCP_CONNTRACK_CLOSE], 1241 .data = &tcp_timeouts[TCP_CONNTRACK_CLOSE],
1242 .maxlen = sizeof(unsigned int), 1242 .maxlen = sizeof(unsigned int),
1243 .mode = 0644, 1243 .mode = 0644,
1244 .proc_handler = &proc_dointvec_jiffies, 1244 .proc_handler = proc_dointvec_jiffies,
1245 }, 1245 },
1246 { 1246 {
1247 .procname = "nf_conntrack_tcp_timeout_max_retrans", 1247 .procname = "nf_conntrack_tcp_timeout_max_retrans",
1248 .data = &nf_ct_tcp_timeout_max_retrans, 1248 .data = &nf_ct_tcp_timeout_max_retrans,
1249 .maxlen = sizeof(unsigned int), 1249 .maxlen = sizeof(unsigned int),
1250 .mode = 0644, 1250 .mode = 0644,
1251 .proc_handler = &proc_dointvec_jiffies, 1251 .proc_handler = proc_dointvec_jiffies,
1252 }, 1252 },
1253 { 1253 {
1254 .procname = "nf_conntrack_tcp_timeout_unacknowledged", 1254 .procname = "nf_conntrack_tcp_timeout_unacknowledged",
1255 .data = &nf_ct_tcp_timeout_unacknowledged, 1255 .data = &nf_ct_tcp_timeout_unacknowledged,
1256 .maxlen = sizeof(unsigned int), 1256 .maxlen = sizeof(unsigned int),
1257 .mode = 0644, 1257 .mode = 0644,
1258 .proc_handler = &proc_dointvec_jiffies, 1258 .proc_handler = proc_dointvec_jiffies,
1259 }, 1259 },
1260 { 1260 {
1261 .ctl_name = NET_NF_CONNTRACK_TCP_LOOSE, 1261 .ctl_name = NET_NF_CONNTRACK_TCP_LOOSE,
@@ -1263,7 +1263,7 @@ static struct ctl_table tcp_sysctl_table[] = {
1263 .data = &nf_ct_tcp_loose, 1263 .data = &nf_ct_tcp_loose,
1264 .maxlen = sizeof(unsigned int), 1264 .maxlen = sizeof(unsigned int),
1265 .mode = 0644, 1265 .mode = 0644,
1266 .proc_handler = &proc_dointvec, 1266 .proc_handler = proc_dointvec,
1267 }, 1267 },
1268 { 1268 {
1269 .ctl_name = NET_NF_CONNTRACK_TCP_BE_LIBERAL, 1269 .ctl_name = NET_NF_CONNTRACK_TCP_BE_LIBERAL,
@@ -1271,7 +1271,7 @@ static struct ctl_table tcp_sysctl_table[] = {
1271 .data = &nf_ct_tcp_be_liberal, 1271 .data = &nf_ct_tcp_be_liberal,
1272 .maxlen = sizeof(unsigned int), 1272 .maxlen = sizeof(unsigned int),
1273 .mode = 0644, 1273 .mode = 0644,
1274 .proc_handler = &proc_dointvec, 1274 .proc_handler = proc_dointvec,
1275 }, 1275 },
1276 { 1276 {
1277 .ctl_name = NET_NF_CONNTRACK_TCP_MAX_RETRANS, 1277 .ctl_name = NET_NF_CONNTRACK_TCP_MAX_RETRANS,
@@ -1279,7 +1279,7 @@ static struct ctl_table tcp_sysctl_table[] = {
1279 .data = &nf_ct_tcp_max_retrans, 1279 .data = &nf_ct_tcp_max_retrans,
1280 .maxlen = sizeof(unsigned int), 1280 .maxlen = sizeof(unsigned int),
1281 .mode = 0644, 1281 .mode = 0644,
1282 .proc_handler = &proc_dointvec, 1282 .proc_handler = proc_dointvec,
1283 }, 1283 },
1284 { 1284 {
1285 .ctl_name = 0 1285 .ctl_name = 0
@@ -1293,63 +1293,63 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
1293 .data = &tcp_timeouts[TCP_CONNTRACK_SYN_SENT], 1293 .data = &tcp_timeouts[TCP_CONNTRACK_SYN_SENT],
1294 .maxlen = sizeof(unsigned int), 1294 .maxlen = sizeof(unsigned int),
1295 .mode = 0644, 1295 .mode = 0644,
1296 .proc_handler = &proc_dointvec_jiffies, 1296 .proc_handler = proc_dointvec_jiffies,
1297 }, 1297 },
1298 { 1298 {
1299 .procname = "ip_conntrack_tcp_timeout_syn_recv", 1299 .procname = "ip_conntrack_tcp_timeout_syn_recv",
1300 .data = &tcp_timeouts[TCP_CONNTRACK_SYN_RECV], 1300 .data = &tcp_timeouts[TCP_CONNTRACK_SYN_RECV],
1301 .maxlen = sizeof(unsigned int), 1301 .maxlen = sizeof(unsigned int),
1302 .mode = 0644, 1302 .mode = 0644,
1303 .proc_handler = &proc_dointvec_jiffies, 1303 .proc_handler = proc_dointvec_jiffies,
1304 }, 1304 },
1305 { 1305 {
1306 .procname = "ip_conntrack_tcp_timeout_established", 1306 .procname = "ip_conntrack_tcp_timeout_established",
1307 .data = &tcp_timeouts[TCP_CONNTRACK_ESTABLISHED], 1307 .data = &tcp_timeouts[TCP_CONNTRACK_ESTABLISHED],
1308 .maxlen = sizeof(unsigned int), 1308 .maxlen = sizeof(unsigned int),
1309 .mode = 0644, 1309 .mode = 0644,
1310 .proc_handler = &proc_dointvec_jiffies, 1310 .proc_handler = proc_dointvec_jiffies,
1311 }, 1311 },
1312 { 1312 {
1313 .procname = "ip_conntrack_tcp_timeout_fin_wait", 1313 .procname = "ip_conntrack_tcp_timeout_fin_wait",
1314 .data = &tcp_timeouts[TCP_CONNTRACK_FIN_WAIT], 1314 .data = &tcp_timeouts[TCP_CONNTRACK_FIN_WAIT],
1315 .maxlen = sizeof(unsigned int), 1315 .maxlen = sizeof(unsigned int),
1316 .mode = 0644, 1316 .mode = 0644,
1317 .proc_handler = &proc_dointvec_jiffies, 1317 .proc_handler = proc_dointvec_jiffies,
1318 }, 1318 },
1319 { 1319 {
1320 .procname = "ip_conntrack_tcp_timeout_close_wait", 1320 .procname = "ip_conntrack_tcp_timeout_close_wait",
1321 .data = &tcp_timeouts[TCP_CONNTRACK_CLOSE_WAIT], 1321 .data = &tcp_timeouts[TCP_CONNTRACK_CLOSE_WAIT],
1322 .maxlen = sizeof(unsigned int), 1322 .maxlen = sizeof(unsigned int),
1323 .mode = 0644, 1323 .mode = 0644,
1324 .proc_handler = &proc_dointvec_jiffies, 1324 .proc_handler = proc_dointvec_jiffies,
1325 }, 1325 },
1326 { 1326 {
1327 .procname = "ip_conntrack_tcp_timeout_last_ack", 1327 .procname = "ip_conntrack_tcp_timeout_last_ack",
1328 .data = &tcp_timeouts[TCP_CONNTRACK_LAST_ACK], 1328 .data = &tcp_timeouts[TCP_CONNTRACK_LAST_ACK],
1329 .maxlen = sizeof(unsigned int), 1329 .maxlen = sizeof(unsigned int),
1330 .mode = 0644, 1330 .mode = 0644,
1331 .proc_handler = &proc_dointvec_jiffies, 1331 .proc_handler = proc_dointvec_jiffies,
1332 }, 1332 },
1333 { 1333 {
1334 .procname = "ip_conntrack_tcp_timeout_time_wait", 1334 .procname = "ip_conntrack_tcp_timeout_time_wait",
1335 .data = &tcp_timeouts[TCP_CONNTRACK_TIME_WAIT], 1335 .data = &tcp_timeouts[TCP_CONNTRACK_TIME_WAIT],
1336 .maxlen = sizeof(unsigned int), 1336 .maxlen = sizeof(unsigned int),
1337 .mode = 0644, 1337 .mode = 0644,
1338 .proc_handler = &proc_dointvec_jiffies, 1338 .proc_handler = proc_dointvec_jiffies,
1339 }, 1339 },
1340 { 1340 {
1341 .procname = "ip_conntrack_tcp_timeout_close", 1341 .procname = "ip_conntrack_tcp_timeout_close",
1342 .data = &tcp_timeouts[TCP_CONNTRACK_CLOSE], 1342 .data = &tcp_timeouts[TCP_CONNTRACK_CLOSE],
1343 .maxlen = sizeof(unsigned int), 1343 .maxlen = sizeof(unsigned int),
1344 .mode = 0644, 1344 .mode = 0644,
1345 .proc_handler = &proc_dointvec_jiffies, 1345 .proc_handler = proc_dointvec_jiffies,
1346 }, 1346 },
1347 { 1347 {
1348 .procname = "ip_conntrack_tcp_timeout_max_retrans", 1348 .procname = "ip_conntrack_tcp_timeout_max_retrans",
1349 .data = &nf_ct_tcp_timeout_max_retrans, 1349 .data = &nf_ct_tcp_timeout_max_retrans,
1350 .maxlen = sizeof(unsigned int), 1350 .maxlen = sizeof(unsigned int),
1351 .mode = 0644, 1351 .mode = 0644,
1352 .proc_handler = &proc_dointvec_jiffies, 1352 .proc_handler = proc_dointvec_jiffies,
1353 }, 1353 },
1354 { 1354 {
1355 .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_LOOSE, 1355 .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_LOOSE,
@@ -1357,7 +1357,7 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
1357 .data = &nf_ct_tcp_loose, 1357 .data = &nf_ct_tcp_loose,
1358 .maxlen = sizeof(unsigned int), 1358 .maxlen = sizeof(unsigned int),
1359 .mode = 0644, 1359 .mode = 0644,
1360 .proc_handler = &proc_dointvec, 1360 .proc_handler = proc_dointvec,
1361 }, 1361 },
1362 { 1362 {
1363 .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_BE_LIBERAL, 1363 .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_BE_LIBERAL,
@@ -1365,7 +1365,7 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
1365 .data = &nf_ct_tcp_be_liberal, 1365 .data = &nf_ct_tcp_be_liberal,
1366 .maxlen = sizeof(unsigned int), 1366 .maxlen = sizeof(unsigned int),
1367 .mode = 0644, 1367 .mode = 0644,
1368 .proc_handler = &proc_dointvec, 1368 .proc_handler = proc_dointvec,
1369 }, 1369 },
1370 { 1370 {
1371 .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_MAX_RETRANS, 1371 .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_MAX_RETRANS,
@@ -1373,7 +1373,7 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
1373 .data = &nf_ct_tcp_max_retrans, 1373 .data = &nf_ct_tcp_max_retrans,
1374 .maxlen = sizeof(unsigned int), 1374 .maxlen = sizeof(unsigned int),
1375 .mode = 0644, 1375 .mode = 0644,
1376 .proc_handler = &proc_dointvec, 1376 .proc_handler = proc_dointvec,
1377 }, 1377 },
1378 { 1378 {
1379 .ctl_name = 0 1379 .ctl_name = 0
diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c
index 7c2ca48698be..2b8b1f579f93 100644
--- a/net/netfilter/nf_conntrack_proto_udp.c
+++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -143,14 +143,14 @@ static struct ctl_table udp_sysctl_table[] = {
143 .data = &nf_ct_udp_timeout, 143 .data = &nf_ct_udp_timeout,
144 .maxlen = sizeof(unsigned int), 144 .maxlen = sizeof(unsigned int),
145 .mode = 0644, 145 .mode = 0644,
146 .proc_handler = &proc_dointvec_jiffies, 146 .proc_handler = proc_dointvec_jiffies,
147 }, 147 },
148 { 148 {
149 .procname = "nf_conntrack_udp_timeout_stream", 149 .procname = "nf_conntrack_udp_timeout_stream",
150 .data = &nf_ct_udp_timeout_stream, 150 .data = &nf_ct_udp_timeout_stream,
151 .maxlen = sizeof(unsigned int), 151 .maxlen = sizeof(unsigned int),
152 .mode = 0644, 152 .mode = 0644,
153 .proc_handler = &proc_dointvec_jiffies, 153 .proc_handler = proc_dointvec_jiffies,
154 }, 154 },
155 { 155 {
156 .ctl_name = 0 156 .ctl_name = 0
@@ -163,14 +163,14 @@ static struct ctl_table udp_compat_sysctl_table[] = {
163 .data = &nf_ct_udp_timeout, 163 .data = &nf_ct_udp_timeout,
164 .maxlen = sizeof(unsigned int), 164 .maxlen = sizeof(unsigned int),
165 .mode = 0644, 165 .mode = 0644,
166 .proc_handler = &proc_dointvec_jiffies, 166 .proc_handler = proc_dointvec_jiffies,
167 }, 167 },
168 { 168 {
169 .procname = "ip_conntrack_udp_timeout_stream", 169 .procname = "ip_conntrack_udp_timeout_stream",
170 .data = &nf_ct_udp_timeout_stream, 170 .data = &nf_ct_udp_timeout_stream,
171 .maxlen = sizeof(unsigned int), 171 .maxlen = sizeof(unsigned int),
172 .mode = 0644, 172 .mode = 0644,
173 .proc_handler = &proc_dointvec_jiffies, 173 .proc_handler = proc_dointvec_jiffies,
174 }, 174 },
175 { 175 {
176 .ctl_name = 0 176 .ctl_name = 0
diff --git a/net/netfilter/nf_conntrack_proto_udplite.c b/net/netfilter/nf_conntrack_proto_udplite.c
index d22d839e4f94..4579d8de13b1 100644
--- a/net/netfilter/nf_conntrack_proto_udplite.c
+++ b/net/netfilter/nf_conntrack_proto_udplite.c
@@ -151,7 +151,7 @@ static struct ctl_table udplite_sysctl_table[] = {
151 .data = &nf_ct_udplite_timeout, 151 .data = &nf_ct_udplite_timeout,
152 .maxlen = sizeof(unsigned int), 152 .maxlen = sizeof(unsigned int),
153 .mode = 0644, 153 .mode = 0644,
154 .proc_handler = &proc_dointvec_jiffies, 154 .proc_handler = proc_dointvec_jiffies,
155 }, 155 },
156 { 156 {
157 .ctl_name = CTL_UNNUMBERED, 157 .ctl_name = CTL_UNNUMBERED,
@@ -159,7 +159,7 @@ static struct ctl_table udplite_sysctl_table[] = {
159 .data = &nf_ct_udplite_timeout_stream, 159 .data = &nf_ct_udplite_timeout_stream,
160 .maxlen = sizeof(unsigned int), 160 .maxlen = sizeof(unsigned int),
161 .mode = 0644, 161 .mode = 0644,
162 .proc_handler = &proc_dointvec_jiffies, 162 .proc_handler = proc_dointvec_jiffies,
163 }, 163 },
164 { 164 {
165 .ctl_name = 0 165 .ctl_name = 0
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 98106d4e89f0..f37b9b74c6a8 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -336,7 +336,7 @@ static ctl_table nf_ct_sysctl_table[] = {
336 .data = &nf_conntrack_max, 336 .data = &nf_conntrack_max,
337 .maxlen = sizeof(int), 337 .maxlen = sizeof(int),
338 .mode = 0644, 338 .mode = 0644,
339 .proc_handler = &proc_dointvec, 339 .proc_handler = proc_dointvec,
340 }, 340 },
341 { 341 {
342 .ctl_name = NET_NF_CONNTRACK_COUNT, 342 .ctl_name = NET_NF_CONNTRACK_COUNT,
@@ -344,7 +344,7 @@ static ctl_table nf_ct_sysctl_table[] = {
344 .data = &init_net.ct.count, 344 .data = &init_net.ct.count,
345 .maxlen = sizeof(int), 345 .maxlen = sizeof(int),
346 .mode = 0444, 346 .mode = 0444,
347 .proc_handler = &proc_dointvec, 347 .proc_handler = proc_dointvec,
348 }, 348 },
349 { 349 {
350 .ctl_name = NET_NF_CONNTRACK_BUCKETS, 350 .ctl_name = NET_NF_CONNTRACK_BUCKETS,
@@ -352,7 +352,7 @@ static ctl_table nf_ct_sysctl_table[] = {
352 .data = &nf_conntrack_htable_size, 352 .data = &nf_conntrack_htable_size,
353 .maxlen = sizeof(unsigned int), 353 .maxlen = sizeof(unsigned int),
354 .mode = 0444, 354 .mode = 0444,
355 .proc_handler = &proc_dointvec, 355 .proc_handler = proc_dointvec,
356 }, 356 },
357 { 357 {
358 .ctl_name = NET_NF_CONNTRACK_CHECKSUM, 358 .ctl_name = NET_NF_CONNTRACK_CHECKSUM,
@@ -360,7 +360,7 @@ static ctl_table nf_ct_sysctl_table[] = {
360 .data = &init_net.ct.sysctl_checksum, 360 .data = &init_net.ct.sysctl_checksum,
361 .maxlen = sizeof(unsigned int), 361 .maxlen = sizeof(unsigned int),
362 .mode = 0644, 362 .mode = 0644,
363 .proc_handler = &proc_dointvec, 363 .proc_handler = proc_dointvec,
364 }, 364 },
365 { 365 {
366 .ctl_name = NET_NF_CONNTRACK_LOG_INVALID, 366 .ctl_name = NET_NF_CONNTRACK_LOG_INVALID,
@@ -368,8 +368,8 @@ static ctl_table nf_ct_sysctl_table[] = {
368 .data = &init_net.ct.sysctl_log_invalid, 368 .data = &init_net.ct.sysctl_log_invalid,
369 .maxlen = sizeof(unsigned int), 369 .maxlen = sizeof(unsigned int),
370 .mode = 0644, 370 .mode = 0644,
371 .proc_handler = &proc_dointvec_minmax, 371 .proc_handler = proc_dointvec_minmax,
372 .strategy = &sysctl_intvec, 372 .strategy = sysctl_intvec,
373 .extra1 = &log_invalid_proto_min, 373 .extra1 = &log_invalid_proto_min,
374 .extra2 = &log_invalid_proto_max, 374 .extra2 = &log_invalid_proto_max,
375 }, 375 },
@@ -379,7 +379,7 @@ static ctl_table nf_ct_sysctl_table[] = {
379 .data = &nf_ct_expect_max, 379 .data = &nf_ct_expect_max,
380 .maxlen = sizeof(int), 380 .maxlen = sizeof(int),
381 .mode = 0644, 381 .mode = 0644,
382 .proc_handler = &proc_dointvec, 382 .proc_handler = proc_dointvec,
383 }, 383 },
384 { .ctl_name = 0 } 384 { .ctl_name = 0 }
385}; 385};
@@ -393,7 +393,7 @@ static ctl_table nf_ct_netfilter_table[] = {
393 .data = &nf_conntrack_max, 393 .data = &nf_conntrack_max,
394 .maxlen = sizeof(int), 394 .maxlen = sizeof(int),
395 .mode = 0644, 395 .mode = 0644,
396 .proc_handler = &proc_dointvec, 396 .proc_handler = proc_dointvec,
397 }, 397 },
398 { .ctl_name = 0 } 398 { .ctl_name = 0 }
399}; 399};
diff --git a/net/netrom/sysctl_net_netrom.c b/net/netrom/sysctl_net_netrom.c
index 34c96c9674df..7b49591fe87c 100644
--- a/net/netrom/sysctl_net_netrom.c
+++ b/net/netrom/sysctl_net_netrom.c
@@ -41,8 +41,8 @@ static ctl_table nr_table[] = {
41 .data = &sysctl_netrom_default_path_quality, 41 .data = &sysctl_netrom_default_path_quality,
42 .maxlen = sizeof(int), 42 .maxlen = sizeof(int),
43 .mode = 0644, 43 .mode = 0644,
44 .proc_handler = &proc_dointvec_minmax, 44 .proc_handler = proc_dointvec_minmax,
45 .strategy = &sysctl_intvec, 45 .strategy = sysctl_intvec,
46 .extra1 = &min_quality, 46 .extra1 = &min_quality,
47 .extra2 = &max_quality 47 .extra2 = &max_quality
48 }, 48 },
@@ -52,8 +52,8 @@ static ctl_table nr_table[] = {
52 .data = &sysctl_netrom_obsolescence_count_initialiser, 52 .data = &sysctl_netrom_obsolescence_count_initialiser,
53 .maxlen = sizeof(int), 53 .maxlen = sizeof(int),
54 .mode = 0644, 54 .mode = 0644,
55 .proc_handler = &proc_dointvec_minmax, 55 .proc_handler = proc_dointvec_minmax,
56 .strategy = &sysctl_intvec, 56 .strategy = sysctl_intvec,
57 .extra1 = &min_obs, 57 .extra1 = &min_obs,
58 .extra2 = &max_obs 58 .extra2 = &max_obs
59 }, 59 },
@@ -63,8 +63,8 @@ static ctl_table nr_table[] = {
63 .data = &sysctl_netrom_network_ttl_initialiser, 63 .data = &sysctl_netrom_network_ttl_initialiser,
64 .maxlen = sizeof(int), 64 .maxlen = sizeof(int),
65 .mode = 0644, 65 .mode = 0644,
66 .proc_handler = &proc_dointvec_minmax, 66 .proc_handler = proc_dointvec_minmax,
67 .strategy = &sysctl_intvec, 67 .strategy = sysctl_intvec,
68 .extra1 = &min_ttl, 68 .extra1 = &min_ttl,
69 .extra2 = &max_ttl 69 .extra2 = &max_ttl
70 }, 70 },
@@ -74,8 +74,8 @@ static ctl_table nr_table[] = {
74 .data = &sysctl_netrom_transport_timeout, 74 .data = &sysctl_netrom_transport_timeout,
75 .maxlen = sizeof(int), 75 .maxlen = sizeof(int),
76 .mode = 0644, 76 .mode = 0644,
77 .proc_handler = &proc_dointvec_minmax, 77 .proc_handler = proc_dointvec_minmax,
78 .strategy = &sysctl_intvec, 78 .strategy = sysctl_intvec,
79 .extra1 = &min_t1, 79 .extra1 = &min_t1,
80 .extra2 = &max_t1 80 .extra2 = &max_t1
81 }, 81 },
@@ -85,8 +85,8 @@ static ctl_table nr_table[] = {
85 .data = &sysctl_netrom_transport_maximum_tries, 85 .data = &sysctl_netrom_transport_maximum_tries,
86 .maxlen = sizeof(int), 86 .maxlen = sizeof(int),
87 .mode = 0644, 87 .mode = 0644,
88 .proc_handler = &proc_dointvec_minmax, 88 .proc_handler = proc_dointvec_minmax,
89 .strategy = &sysctl_intvec, 89 .strategy = sysctl_intvec,
90 .extra1 = &min_n2, 90 .extra1 = &min_n2,
91 .extra2 = &max_n2 91 .extra2 = &max_n2
92 }, 92 },
@@ -96,8 +96,8 @@ static ctl_table nr_table[] = {
96 .data = &sysctl_netrom_transport_acknowledge_delay, 96 .data = &sysctl_netrom_transport_acknowledge_delay,
97 .maxlen = sizeof(int), 97 .maxlen = sizeof(int),
98 .mode = 0644, 98 .mode = 0644,
99 .proc_handler = &proc_dointvec_minmax, 99 .proc_handler = proc_dointvec_minmax,
100 .strategy = &sysctl_intvec, 100 .strategy = sysctl_intvec,
101 .extra1 = &min_t2, 101 .extra1 = &min_t2,
102 .extra2 = &max_t2 102 .extra2 = &max_t2
103 }, 103 },
@@ -107,8 +107,8 @@ static ctl_table nr_table[] = {
107 .data = &sysctl_netrom_transport_busy_delay, 107 .data = &sysctl_netrom_transport_busy_delay,
108 .maxlen = sizeof(int), 108 .maxlen = sizeof(int),
109 .mode = 0644, 109 .mode = 0644,
110 .proc_handler = &proc_dointvec_minmax, 110 .proc_handler = proc_dointvec_minmax,
111 .strategy = &sysctl_intvec, 111 .strategy = sysctl_intvec,
112 .extra1 = &min_t4, 112 .extra1 = &min_t4,
113 .extra2 = &max_t4 113 .extra2 = &max_t4
114 }, 114 },
@@ -118,8 +118,8 @@ static ctl_table nr_table[] = {
118 .data = &sysctl_netrom_transport_requested_window_size, 118 .data = &sysctl_netrom_transport_requested_window_size,
119 .maxlen = sizeof(int), 119 .maxlen = sizeof(int),
120 .mode = 0644, 120 .mode = 0644,
121 .proc_handler = &proc_dointvec_minmax, 121 .proc_handler = proc_dointvec_minmax,
122 .strategy = &sysctl_intvec, 122 .strategy = sysctl_intvec,
123 .extra1 = &min_window, 123 .extra1 = &min_window,
124 .extra2 = &max_window 124 .extra2 = &max_window
125 }, 125 },
@@ -129,8 +129,8 @@ static ctl_table nr_table[] = {
129 .data = &sysctl_netrom_transport_no_activity_timeout, 129 .data = &sysctl_netrom_transport_no_activity_timeout,
130 .maxlen = sizeof(int), 130 .maxlen = sizeof(int),
131 .mode = 0644, 131 .mode = 0644,
132 .proc_handler = &proc_dointvec_minmax, 132 .proc_handler = proc_dointvec_minmax,
133 .strategy = &sysctl_intvec, 133 .strategy = sysctl_intvec,
134 .extra1 = &min_idle, 134 .extra1 = &min_idle,
135 .extra2 = &max_idle 135 .extra2 = &max_idle
136 }, 136 },
@@ -140,8 +140,8 @@ static ctl_table nr_table[] = {
140 .data = &sysctl_netrom_routing_control, 140 .data = &sysctl_netrom_routing_control,
141 .maxlen = sizeof(int), 141 .maxlen = sizeof(int),
142 .mode = 0644, 142 .mode = 0644,
143 .proc_handler = &proc_dointvec_minmax, 143 .proc_handler = proc_dointvec_minmax,
144 .strategy = &sysctl_intvec, 144 .strategy = sysctl_intvec,
145 .extra1 = &min_route, 145 .extra1 = &min_route,
146 .extra2 = &max_route 146 .extra2 = &max_route
147 }, 147 },
@@ -151,8 +151,8 @@ static ctl_table nr_table[] = {
151 .data = &sysctl_netrom_link_fails_count, 151 .data = &sysctl_netrom_link_fails_count,
152 .maxlen = sizeof(int), 152 .maxlen = sizeof(int),
153 .mode = 0644, 153 .mode = 0644,
154 .proc_handler = &proc_dointvec_minmax, 154 .proc_handler = proc_dointvec_minmax,
155 .strategy = &sysctl_intvec, 155 .strategy = sysctl_intvec,
156 .extra1 = &min_fails, 156 .extra1 = &min_fails,
157 .extra2 = &max_fails 157 .extra2 = &max_fails
158 }, 158 },
@@ -162,8 +162,8 @@ static ctl_table nr_table[] = {
162 .data = &sysctl_netrom_reset_circuit, 162 .data = &sysctl_netrom_reset_circuit,
163 .maxlen = sizeof(int), 163 .maxlen = sizeof(int),
164 .mode = 0644, 164 .mode = 0644,
165 .proc_handler = &proc_dointvec_minmax, 165 .proc_handler = proc_dointvec_minmax,
166 .strategy = &sysctl_intvec, 166 .strategy = sysctl_intvec,
167 .extra1 = &min_reset, 167 .extra1 = &min_reset,
168 .extra2 = &max_reset 168 .extra2 = &max_reset
169 }, 169 },
diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
index 600a4309b8c8..0e3347bbdb12 100644
--- a/net/phonet/sysctl.c
+++ b/net/phonet/sysctl.c
@@ -89,7 +89,7 @@ static struct ctl_table phonet_table[] = {
89 .data = &local_port_range, 89 .data = &local_port_range,
90 .maxlen = sizeof(local_port_range), 90 .maxlen = sizeof(local_port_range),
91 .mode = 0644, 91 .mode = 0644,
92 .proc_handler = &proc_local_port_range, 92 .proc_handler = proc_local_port_range,
93 .strategy = NULL, 93 .strategy = NULL,
94 }, 94 },
95 { .ctl_name = 0 } 95 { .ctl_name = 0 }
diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c
index 20be3485a97f..3bfe504faf86 100644
--- a/net/rose/sysctl_net_rose.c
+++ b/net/rose/sysctl_net_rose.c
@@ -31,8 +31,8 @@ static ctl_table rose_table[] = {
31 .data = &sysctl_rose_restart_request_timeout, 31 .data = &sysctl_rose_restart_request_timeout,
32 .maxlen = sizeof(int), 32 .maxlen = sizeof(int),
33 .mode = 0644, 33 .mode = 0644,
34 .proc_handler = &proc_dointvec_minmax, 34 .proc_handler = proc_dointvec_minmax,
35 .strategy = &sysctl_intvec, 35 .strategy = sysctl_intvec,
36 .extra1 = &min_timer, 36 .extra1 = &min_timer,
37 .extra2 = &max_timer 37 .extra2 = &max_timer
38 }, 38 },
@@ -42,8 +42,8 @@ static ctl_table rose_table[] = {
42 .data = &sysctl_rose_call_request_timeout, 42 .data = &sysctl_rose_call_request_timeout,
43 .maxlen = sizeof(int), 43 .maxlen = sizeof(int),
44 .mode = 0644, 44 .mode = 0644,
45 .proc_handler = &proc_dointvec_minmax, 45 .proc_handler = proc_dointvec_minmax,
46 .strategy = &sysctl_intvec, 46 .strategy = sysctl_intvec,
47 .extra1 = &min_timer, 47 .extra1 = &min_timer,
48 .extra2 = &max_timer 48 .extra2 = &max_timer
49 }, 49 },
@@ -53,8 +53,8 @@ static ctl_table rose_table[] = {
53 .data = &sysctl_rose_reset_request_timeout, 53 .data = &sysctl_rose_reset_request_timeout,
54 .maxlen = sizeof(int), 54 .maxlen = sizeof(int),
55 .mode = 0644, 55 .mode = 0644,
56 .proc_handler = &proc_dointvec_minmax, 56 .proc_handler = proc_dointvec_minmax,
57 .strategy = &sysctl_intvec, 57 .strategy = sysctl_intvec,
58 .extra1 = &min_timer, 58 .extra1 = &min_timer,
59 .extra2 = &max_timer 59 .extra2 = &max_timer
60 }, 60 },
@@ -64,8 +64,8 @@ static ctl_table rose_table[] = {
64 .data = &sysctl_rose_clear_request_timeout, 64 .data = &sysctl_rose_clear_request_timeout,
65 .maxlen = sizeof(int), 65 .maxlen = sizeof(int),
66 .mode = 0644, 66 .mode = 0644,
67 .proc_handler = &proc_dointvec_minmax, 67 .proc_handler = proc_dointvec_minmax,
68 .strategy = &sysctl_intvec, 68 .strategy = sysctl_intvec,
69 .extra1 = &min_timer, 69 .extra1 = &min_timer,
70 .extra2 = &max_timer 70 .extra2 = &max_timer
71 }, 71 },
@@ -75,8 +75,8 @@ static ctl_table rose_table[] = {
75 .data = &sysctl_rose_no_activity_timeout, 75 .data = &sysctl_rose_no_activity_timeout,
76 .maxlen = sizeof(int), 76 .maxlen = sizeof(int),
77 .mode = 0644, 77 .mode = 0644,
78 .proc_handler = &proc_dointvec_minmax, 78 .proc_handler = proc_dointvec_minmax,
79 .strategy = &sysctl_intvec, 79 .strategy = sysctl_intvec,
80 .extra1 = &min_idle, 80 .extra1 = &min_idle,
81 .extra2 = &max_idle 81 .extra2 = &max_idle
82 }, 82 },
@@ -86,8 +86,8 @@ static ctl_table rose_table[] = {
86 .data = &sysctl_rose_ack_hold_back_timeout, 86 .data = &sysctl_rose_ack_hold_back_timeout,
87 .maxlen = sizeof(int), 87 .maxlen = sizeof(int),
88 .mode = 0644, 88 .mode = 0644,
89 .proc_handler = &proc_dointvec_minmax, 89 .proc_handler = proc_dointvec_minmax,
90 .strategy = &sysctl_intvec, 90 .strategy = sysctl_intvec,
91 .extra1 = &min_timer, 91 .extra1 = &min_timer,
92 .extra2 = &max_timer 92 .extra2 = &max_timer
93 }, 93 },
@@ -97,8 +97,8 @@ static ctl_table rose_table[] = {
97 .data = &sysctl_rose_routing_control, 97 .data = &sysctl_rose_routing_control,
98 .maxlen = sizeof(int), 98 .maxlen = sizeof(int),
99 .mode = 0644, 99 .mode = 0644,
100 .proc_handler = &proc_dointvec_minmax, 100 .proc_handler = proc_dointvec_minmax,
101 .strategy = &sysctl_intvec, 101 .strategy = sysctl_intvec,
102 .extra1 = &min_route, 102 .extra1 = &min_route,
103 .extra2 = &max_route 103 .extra2 = &max_route
104 }, 104 },
@@ -108,8 +108,8 @@ static ctl_table rose_table[] = {
108 .data = &sysctl_rose_link_fail_timeout, 108 .data = &sysctl_rose_link_fail_timeout,
109 .maxlen = sizeof(int), 109 .maxlen = sizeof(int),
110 .mode = 0644, 110 .mode = 0644,
111 .proc_handler = &proc_dointvec_minmax, 111 .proc_handler = proc_dointvec_minmax,
112 .strategy = &sysctl_intvec, 112 .strategy = sysctl_intvec,
113 .extra1 = &min_ftimer, 113 .extra1 = &min_ftimer,
114 .extra2 = &max_ftimer 114 .extra2 = &max_ftimer
115 }, 115 },
@@ -119,8 +119,8 @@ static ctl_table rose_table[] = {
119 .data = &sysctl_rose_maximum_vcs, 119 .data = &sysctl_rose_maximum_vcs,
120 .maxlen = sizeof(int), 120 .maxlen = sizeof(int),
121 .mode = 0644, 121 .mode = 0644,
122 .proc_handler = &proc_dointvec_minmax, 122 .proc_handler = proc_dointvec_minmax,
123 .strategy = &sysctl_intvec, 123 .strategy = sysctl_intvec,
124 .extra1 = &min_maxvcs, 124 .extra1 = &min_maxvcs,
125 .extra2 = &max_maxvcs 125 .extra2 = &max_maxvcs
126 }, 126 },
@@ -130,8 +130,8 @@ static ctl_table rose_table[] = {
130 .data = &sysctl_rose_window_size, 130 .data = &sysctl_rose_window_size,
131 .maxlen = sizeof(int), 131 .maxlen = sizeof(int),
132 .mode = 0644, 132 .mode = 0644,
133 .proc_handler = &proc_dointvec_minmax, 133 .proc_handler = proc_dointvec_minmax,
134 .strategy = &sysctl_intvec, 134 .strategy = sysctl_intvec,
135 .extra1 = &min_window, 135 .extra1 = &min_window,
136 .extra2 = &max_window 136 .extra2 = &max_window
137 }, 137 },
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index 52910697e104..f58e994e6852 100644
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -63,8 +63,8 @@ static ctl_table sctp_table[] = {
63 .data = &sctp_rto_initial, 63 .data = &sctp_rto_initial,
64 .maxlen = sizeof(unsigned int), 64 .maxlen = sizeof(unsigned int),
65 .mode = 0644, 65 .mode = 0644,
66 .proc_handler = &proc_dointvec_minmax, 66 .proc_handler = proc_dointvec_minmax,
67 .strategy = &sysctl_intvec, 67 .strategy = sysctl_intvec,
68 .extra1 = &one, 68 .extra1 = &one,
69 .extra2 = &timer_max 69 .extra2 = &timer_max
70 }, 70 },
@@ -74,8 +74,8 @@ static ctl_table sctp_table[] = {
74 .data = &sctp_rto_min, 74 .data = &sctp_rto_min,
75 .maxlen = sizeof(unsigned int), 75 .maxlen = sizeof(unsigned int),
76 .mode = 0644, 76 .mode = 0644,
77 .proc_handler = &proc_dointvec_minmax, 77 .proc_handler = proc_dointvec_minmax,
78 .strategy = &sysctl_intvec, 78 .strategy = sysctl_intvec,
79 .extra1 = &one, 79 .extra1 = &one,
80 .extra2 = &timer_max 80 .extra2 = &timer_max
81 }, 81 },
@@ -85,8 +85,8 @@ static ctl_table sctp_table[] = {
85 .data = &sctp_rto_max, 85 .data = &sctp_rto_max,
86 .maxlen = sizeof(unsigned int), 86 .maxlen = sizeof(unsigned int),
87 .mode = 0644, 87 .mode = 0644,
88 .proc_handler = &proc_dointvec_minmax, 88 .proc_handler = proc_dointvec_minmax,
89 .strategy = &sysctl_intvec, 89 .strategy = sysctl_intvec,
90 .extra1 = &one, 90 .extra1 = &one,
91 .extra2 = &timer_max 91 .extra2 = &timer_max
92 }, 92 },
@@ -96,8 +96,8 @@ static ctl_table sctp_table[] = {
96 .data = &sctp_valid_cookie_life, 96 .data = &sctp_valid_cookie_life,
97 .maxlen = sizeof(unsigned int), 97 .maxlen = sizeof(unsigned int),
98 .mode = 0644, 98 .mode = 0644,
99 .proc_handler = &proc_dointvec_minmax, 99 .proc_handler = proc_dointvec_minmax,
100 .strategy = &sysctl_intvec, 100 .strategy = sysctl_intvec,
101 .extra1 = &one, 101 .extra1 = &one,
102 .extra2 = &timer_max 102 .extra2 = &timer_max
103 }, 103 },
@@ -107,8 +107,8 @@ static ctl_table sctp_table[] = {
107 .data = &sctp_max_burst, 107 .data = &sctp_max_burst,
108 .maxlen = sizeof(int), 108 .maxlen = sizeof(int),
109 .mode = 0644, 109 .mode = 0644,
110 .proc_handler = &proc_dointvec_minmax, 110 .proc_handler = proc_dointvec_minmax,
111 .strategy = &sysctl_intvec, 111 .strategy = sysctl_intvec,
112 .extra1 = &zero, 112 .extra1 = &zero,
113 .extra2 = &int_max 113 .extra2 = &int_max
114 }, 114 },
@@ -118,8 +118,8 @@ static ctl_table sctp_table[] = {
118 .data = &sctp_max_retrans_association, 118 .data = &sctp_max_retrans_association,
119 .maxlen = sizeof(int), 119 .maxlen = sizeof(int),
120 .mode = 0644, 120 .mode = 0644,
121 .proc_handler = &proc_dointvec_minmax, 121 .proc_handler = proc_dointvec_minmax,
122 .strategy = &sysctl_intvec, 122 .strategy = sysctl_intvec,
123 .extra1 = &one, 123 .extra1 = &one,
124 .extra2 = &int_max 124 .extra2 = &int_max
125 }, 125 },
@@ -129,8 +129,8 @@ static ctl_table sctp_table[] = {
129 .data = &sctp_sndbuf_policy, 129 .data = &sctp_sndbuf_policy,
130 .maxlen = sizeof(int), 130 .maxlen = sizeof(int),
131 .mode = 0644, 131 .mode = 0644,
132 .proc_handler = &proc_dointvec, 132 .proc_handler = proc_dointvec,
133 .strategy = &sysctl_intvec 133 .strategy = sysctl_intvec
134 }, 134 },
135 { 135 {
136 .ctl_name = NET_SCTP_RCVBUF_POLICY, 136 .ctl_name = NET_SCTP_RCVBUF_POLICY,
@@ -138,8 +138,8 @@ static ctl_table sctp_table[] = {
138 .data = &sctp_rcvbuf_policy, 138 .data = &sctp_rcvbuf_policy,
139 .maxlen = sizeof(int), 139 .maxlen = sizeof(int),
140 .mode = 0644, 140 .mode = 0644,
141 .proc_handler = &proc_dointvec, 141 .proc_handler = proc_dointvec,
142 .strategy = &sysctl_intvec 142 .strategy = sysctl_intvec
143 }, 143 },
144 { 144 {
145 .ctl_name = NET_SCTP_PATH_MAX_RETRANS, 145 .ctl_name = NET_SCTP_PATH_MAX_RETRANS,
@@ -147,8 +147,8 @@ static ctl_table sctp_table[] = {
147 .data = &sctp_max_retrans_path, 147 .data = &sctp_max_retrans_path,
148 .maxlen = sizeof(int), 148 .maxlen = sizeof(int),
149 .mode = 0644, 149 .mode = 0644,
150 .proc_handler = &proc_dointvec_minmax, 150 .proc_handler = proc_dointvec_minmax,
151 .strategy = &sysctl_intvec, 151 .strategy = sysctl_intvec,
152 .extra1 = &one, 152 .extra1 = &one,
153 .extra2 = &int_max 153 .extra2 = &int_max
154 }, 154 },
@@ -158,8 +158,8 @@ static ctl_table sctp_table[] = {
158 .data = &sctp_max_retrans_init, 158 .data = &sctp_max_retrans_init,
159 .maxlen = sizeof(int), 159 .maxlen = sizeof(int),
160 .mode = 0644, 160 .mode = 0644,
161 .proc_handler = &proc_dointvec_minmax, 161 .proc_handler = proc_dointvec_minmax,
162 .strategy = &sysctl_intvec, 162 .strategy = sysctl_intvec,
163 .extra1 = &one, 163 .extra1 = &one,
164 .extra2 = &int_max 164 .extra2 = &int_max
165 }, 165 },
@@ -169,8 +169,8 @@ static ctl_table sctp_table[] = {
169 .data = &sctp_hb_interval, 169 .data = &sctp_hb_interval,
170 .maxlen = sizeof(unsigned int), 170 .maxlen = sizeof(unsigned int),
171 .mode = 0644, 171 .mode = 0644,
172 .proc_handler = &proc_dointvec_minmax, 172 .proc_handler = proc_dointvec_minmax,
173 .strategy = &sysctl_intvec, 173 .strategy = sysctl_intvec,
174 .extra1 = &one, 174 .extra1 = &one,
175 .extra2 = &timer_max 175 .extra2 = &timer_max
176 }, 176 },
@@ -180,8 +180,8 @@ static ctl_table sctp_table[] = {
180 .data = &sctp_cookie_preserve_enable, 180 .data = &sctp_cookie_preserve_enable,
181 .maxlen = sizeof(int), 181 .maxlen = sizeof(int),
182 .mode = 0644, 182 .mode = 0644,
183 .proc_handler = &proc_dointvec, 183 .proc_handler = proc_dointvec,
184 .strategy = &sysctl_intvec 184 .strategy = sysctl_intvec
185 }, 185 },
186 { 186 {
187 .ctl_name = NET_SCTP_RTO_ALPHA, 187 .ctl_name = NET_SCTP_RTO_ALPHA,
@@ -189,8 +189,8 @@ static ctl_table sctp_table[] = {
189 .data = &sctp_rto_alpha, 189 .data = &sctp_rto_alpha,
190 .maxlen = sizeof(int), 190 .maxlen = sizeof(int),
191 .mode = 0444, 191 .mode = 0444,
192 .proc_handler = &proc_dointvec, 192 .proc_handler = proc_dointvec,
193 .strategy = &sysctl_intvec 193 .strategy = sysctl_intvec
194 }, 194 },
195 { 195 {
196 .ctl_name = NET_SCTP_RTO_BETA, 196 .ctl_name = NET_SCTP_RTO_BETA,
@@ -198,8 +198,8 @@ static ctl_table sctp_table[] = {
198 .data = &sctp_rto_beta, 198 .data = &sctp_rto_beta,
199 .maxlen = sizeof(int), 199 .maxlen = sizeof(int),
200 .mode = 0444, 200 .mode = 0444,
201 .proc_handler = &proc_dointvec, 201 .proc_handler = proc_dointvec,
202 .strategy = &sysctl_intvec 202 .strategy = sysctl_intvec
203 }, 203 },
204 { 204 {
205 .ctl_name = NET_SCTP_ADDIP_ENABLE, 205 .ctl_name = NET_SCTP_ADDIP_ENABLE,
@@ -207,8 +207,8 @@ static ctl_table sctp_table[] = {
207 .data = &sctp_addip_enable, 207 .data = &sctp_addip_enable,
208 .maxlen = sizeof(int), 208 .maxlen = sizeof(int),
209 .mode = 0644, 209 .mode = 0644,
210 .proc_handler = &proc_dointvec, 210 .proc_handler = proc_dointvec,
211 .strategy = &sysctl_intvec 211 .strategy = sysctl_intvec
212 }, 212 },
213 { 213 {
214 .ctl_name = NET_SCTP_PRSCTP_ENABLE, 214 .ctl_name = NET_SCTP_PRSCTP_ENABLE,
@@ -216,8 +216,8 @@ static ctl_table sctp_table[] = {
216 .data = &sctp_prsctp_enable, 216 .data = &sctp_prsctp_enable,
217 .maxlen = sizeof(int), 217 .maxlen = sizeof(int),
218 .mode = 0644, 218 .mode = 0644,
219 .proc_handler = &proc_dointvec, 219 .proc_handler = proc_dointvec,
220 .strategy = &sysctl_intvec 220 .strategy = sysctl_intvec
221 }, 221 },
222 { 222 {
223 .ctl_name = NET_SCTP_SACK_TIMEOUT, 223 .ctl_name = NET_SCTP_SACK_TIMEOUT,
@@ -225,8 +225,8 @@ static ctl_table sctp_table[] = {
225 .data = &sctp_sack_timeout, 225 .data = &sctp_sack_timeout,
226 .maxlen = sizeof(long), 226 .maxlen = sizeof(long),
227 .mode = 0644, 227 .mode = 0644,
228 .proc_handler = &proc_dointvec_minmax, 228 .proc_handler = proc_dointvec_minmax,
229 .strategy = &sysctl_intvec, 229 .strategy = sysctl_intvec,
230 .extra1 = &sack_timer_min, 230 .extra1 = &sack_timer_min,
231 .extra2 = &sack_timer_max, 231 .extra2 = &sack_timer_max,
232 }, 232 },
@@ -236,7 +236,7 @@ static ctl_table sctp_table[] = {
236 .data = &sysctl_sctp_mem, 236 .data = &sysctl_sctp_mem,
237 .maxlen = sizeof(sysctl_sctp_mem), 237 .maxlen = sizeof(sysctl_sctp_mem),
238 .mode = 0644, 238 .mode = 0644,
239 .proc_handler = &proc_dointvec, 239 .proc_handler = proc_dointvec,
240 }, 240 },
241 { 241 {
242 .ctl_name = CTL_UNNUMBERED, 242 .ctl_name = CTL_UNNUMBERED,
@@ -244,7 +244,7 @@ static ctl_table sctp_table[] = {
244 .data = &sysctl_sctp_rmem, 244 .data = &sysctl_sctp_rmem,
245 .maxlen = sizeof(sysctl_sctp_rmem), 245 .maxlen = sizeof(sysctl_sctp_rmem),
246 .mode = 0644, 246 .mode = 0644,
247 .proc_handler = &proc_dointvec, 247 .proc_handler = proc_dointvec,
248 }, 248 },
249 { 249 {
250 .ctl_name = CTL_UNNUMBERED, 250 .ctl_name = CTL_UNNUMBERED,
@@ -252,7 +252,7 @@ static ctl_table sctp_table[] = {
252 .data = &sysctl_sctp_wmem, 252 .data = &sysctl_sctp_wmem,
253 .maxlen = sizeof(sysctl_sctp_wmem), 253 .maxlen = sizeof(sysctl_sctp_wmem),
254 .mode = 0644, 254 .mode = 0644,
255 .proc_handler = &proc_dointvec, 255 .proc_handler = proc_dointvec,
256 }, 256 },
257 { 257 {
258 .ctl_name = CTL_UNNUMBERED, 258 .ctl_name = CTL_UNNUMBERED,
@@ -260,8 +260,8 @@ static ctl_table sctp_table[] = {
260 .data = &sctp_auth_enable, 260 .data = &sctp_auth_enable,
261 .maxlen = sizeof(int), 261 .maxlen = sizeof(int),
262 .mode = 0644, 262 .mode = 0644,
263 .proc_handler = &proc_dointvec, 263 .proc_handler = proc_dointvec,
264 .strategy = &sysctl_intvec 264 .strategy = sysctl_intvec
265 }, 265 },
266 { 266 {
267 .ctl_name = CTL_UNNUMBERED, 267 .ctl_name = CTL_UNNUMBERED,
@@ -269,8 +269,8 @@ static ctl_table sctp_table[] = {
269 .data = &sctp_addip_noauth, 269 .data = &sctp_addip_noauth,
270 .maxlen = sizeof(int), 270 .maxlen = sizeof(int),
271 .mode = 0644, 271 .mode = 0644,
272 .proc_handler = &proc_dointvec, 272 .proc_handler = proc_dointvec,
273 .strategy = &sysctl_intvec 273 .strategy = sysctl_intvec
274 }, 274 },
275 { .ctl_name = 0 } 275 { .ctl_name = 0 }
276}; 276};
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 1f4040cdadad..83c093077ebc 100644
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -21,7 +21,7 @@ static ctl_table unix_table[] = {
21 .data = &init_net.unx.sysctl_max_dgram_qlen, 21 .data = &init_net.unx.sysctl_max_dgram_qlen,
22 .maxlen = sizeof(int), 22 .maxlen = sizeof(int),
23 .mode = 0644, 23 .mode = 0644,
24 .proc_handler = &proc_dointvec 24 .proc_handler = proc_dointvec
25 }, 25 },
26 { .ctl_name = 0 } 26 { .ctl_name = 0 }
27}; 27};
diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
index 6ebda25c24e9..a5d3416522de 100644
--- a/net/x25/sysctl_net_x25.c
+++ b/net/x25/sysctl_net_x25.c
@@ -24,8 +24,8 @@ static struct ctl_table x25_table[] = {
24 .data = &sysctl_x25_restart_request_timeout, 24 .data = &sysctl_x25_restart_request_timeout,
25 .maxlen = sizeof(int), 25 .maxlen = sizeof(int),
26 .mode = 0644, 26 .mode = 0644,
27 .proc_handler = &proc_dointvec_minmax, 27 .proc_handler = proc_dointvec_minmax,
28 .strategy = &sysctl_intvec, 28 .strategy = sysctl_intvec,
29 .extra1 = &min_timer, 29 .extra1 = &min_timer,
30 .extra2 = &max_timer, 30 .extra2 = &max_timer,
31 }, 31 },
@@ -35,8 +35,8 @@ static struct ctl_table x25_table[] = {
35 .data = &sysctl_x25_call_request_timeout, 35 .data = &sysctl_x25_call_request_timeout,
36 .maxlen = sizeof(int), 36 .maxlen = sizeof(int),
37 .mode = 0644, 37 .mode = 0644,
38 .proc_handler = &proc_dointvec_minmax, 38 .proc_handler = proc_dointvec_minmax,
39 .strategy = &sysctl_intvec, 39 .strategy = sysctl_intvec,
40 .extra1 = &min_timer, 40 .extra1 = &min_timer,
41 .extra2 = &max_timer, 41 .extra2 = &max_timer,
42 }, 42 },
@@ -46,8 +46,8 @@ static struct ctl_table x25_table[] = {
46 .data = &sysctl_x25_reset_request_timeout, 46 .data = &sysctl_x25_reset_request_timeout,
47 .maxlen = sizeof(int), 47 .maxlen = sizeof(int),
48 .mode = 0644, 48 .mode = 0644,
49 .proc_handler = &proc_dointvec_minmax, 49 .proc_handler = proc_dointvec_minmax,
50 .strategy = &sysctl_intvec, 50 .strategy = sysctl_intvec,
51 .extra1 = &min_timer, 51 .extra1 = &min_timer,
52 .extra2 = &max_timer, 52 .extra2 = &max_timer,
53 }, 53 },
@@ -57,8 +57,8 @@ static struct ctl_table x25_table[] = {
57 .data = &sysctl_x25_clear_request_timeout, 57 .data = &sysctl_x25_clear_request_timeout,
58 .maxlen = sizeof(int), 58 .maxlen = sizeof(int),
59 .mode = 0644, 59 .mode = 0644,
60 .proc_handler = &proc_dointvec_minmax, 60 .proc_handler = proc_dointvec_minmax,
61 .strategy = &sysctl_intvec, 61 .strategy = sysctl_intvec,
62 .extra1 = &min_timer, 62 .extra1 = &min_timer,
63 .extra2 = &max_timer, 63 .extra2 = &max_timer,
64 }, 64 },
@@ -68,8 +68,8 @@ static struct ctl_table x25_table[] = {
68 .data = &sysctl_x25_ack_holdback_timeout, 68 .data = &sysctl_x25_ack_holdback_timeout,
69 .maxlen = sizeof(int), 69 .maxlen = sizeof(int),
70 .mode = 0644, 70 .mode = 0644,
71 .proc_handler = &proc_dointvec_minmax, 71 .proc_handler = proc_dointvec_minmax,
72 .strategy = &sysctl_intvec, 72 .strategy = sysctl_intvec,
73 .extra1 = &min_timer, 73 .extra1 = &min_timer,
74 .extra2 = &max_timer, 74 .extra2 = &max_timer,
75 }, 75 },
@@ -79,7 +79,7 @@ static struct ctl_table x25_table[] = {
79 .data = &sysctl_x25_forward, 79 .data = &sysctl_x25_forward,
80 .maxlen = sizeof(int), 80 .maxlen = sizeof(int),
81 .mode = 0644, 81 .mode = 0644,
82 .proc_handler = &proc_dointvec, 82 .proc_handler = proc_dointvec,
83 }, 83 },
84 { 0, }, 84 { 0, },
85}; 85};
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 00:57:45 -0500