aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/ax25/sysctl_net_ax25.c2
-rw-r--r--net/bridge/br_netfilter.c4
-rw-r--r--net/core/neighbour.c6
-rw-r--r--net/core/sysctl_net_core.c8
-rw-r--r--net/decnet/dn_dev.c6
-rw-r--r--net/decnet/sysctl_net_decnet.c6
-rw-r--r--net/ipv4/devinet.c6
-rw-r--r--net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c2
-rw-r--r--net/ipv4/route.c4
-rw-r--r--net/ipv4/sysctl_net_ipv4.c31
-rw-r--r--net/ipv6/addrconf.c10
-rw-r--r--net/ipv6/icmp.c2
-rw-r--r--net/ipv6/route.c4
-rw-r--r--net/ipv6/sysctl_net_ipv6.c4
-rw-r--r--net/irda/irsysctl.c6
-rw-r--r--net/netfilter/ipvs/ip_vs_ctl.c8
-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_standalone.c4
-rw-r--r--net/netfilter/nf_log.c2
-rw-r--r--net/netrom/sysctl_net_netrom.c2
-rw-r--r--net/phonet/sysctl.c4
-rw-r--r--net/rds/ib_sysctl.c2
-rw-r--r--net/rds/iw_sysctl.c2
-rw-r--r--net/rds/sysctl.c2
-rw-r--r--net/rose/sysctl_net_rose.c2
-rw-r--r--net/sctp/sysctl.c10
-rw-r--r--net/sunrpc/sysctl.c10
-rw-r--r--net/sunrpc/xprtrdma/svc_rdma.c8
-rw-r--r--net/sunrpc/xprtrdma/transport.c4
-rw-r--r--net/sunrpc/xprtsock.c4
-rw-r--r--net/unix/sysctl_net_unix.c2
32 files changed, 86 insertions, 85 deletions
diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
index d5744b752511..919a5ce47515 100644
--- a/net/ax25/sysctl_net_ax25.c
+++ b/net/ax25/sysctl_net_ax25.c
@@ -29,7 +29,7 @@ static int min_proto[1], max_proto[] = { AX25_PROTO_MAX };
29static int min_ds_timeout[1], max_ds_timeout[] = {65535000}; 29static int min_ds_timeout[1], max_ds_timeout[] = {65535000};
30#endif 30#endif
31 31
32static const ctl_table ax25_param_table[] = { 32static const struct ctl_table ax25_param_table[] = {
33 { 33 {
34 .procname = "ip_default_mode", 34 .procname = "ip_default_mode",
35 .maxlen = sizeof(int), 35 .maxlen = sizeof(int),
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 1ed75bfd8d1d..f87736270eaa 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -992,7 +992,7 @@ static struct nf_hook_ops br_nf_ops[] __read_mostly = {
992 992
993#ifdef CONFIG_SYSCTL 993#ifdef CONFIG_SYSCTL
994static 994static
995int brnf_sysctl_call_tables(ctl_table * ctl, int write, 995int brnf_sysctl_call_tables(struct ctl_table *ctl, int write,
996 void __user * buffer, size_t * lenp, loff_t * ppos) 996 void __user * buffer, size_t * lenp, loff_t * ppos)
997{ 997{
998 int ret; 998 int ret;
@@ -1004,7 +1004,7 @@ int brnf_sysctl_call_tables(ctl_table * ctl, int write,
1004 return ret; 1004 return ret;
1005} 1005}
1006 1006
1007static ctl_table brnf_table[] = { 1007static struct ctl_table brnf_table[] = {
1008 { 1008 {
1009 .procname = "bridge-nf-call-arptables", 1009 .procname = "bridge-nf-call-arptables",
1010 .data = &brnf_call_arptables, 1010 .data = &brnf_call_arptables,
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 5c56b217b999..decaa4b9db2f 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2765,11 +2765,11 @@ EXPORT_SYMBOL(neigh_app_ns);
2765static int zero; 2765static int zero;
2766static int unres_qlen_max = INT_MAX / SKB_TRUESIZE(ETH_FRAME_LEN); 2766static int unres_qlen_max = INT_MAX / SKB_TRUESIZE(ETH_FRAME_LEN);
2767 2767
2768static int proc_unres_qlen(ctl_table *ctl, int write, void __user *buffer, 2768static int proc_unres_qlen(struct ctl_table *ctl, int write,
2769 size_t *lenp, loff_t *ppos) 2769 void __user *buffer, size_t *lenp, loff_t *ppos)
2770{ 2770{
2771 int size, ret; 2771 int size, ret;
2772 ctl_table tmp = *ctl; 2772 struct ctl_table tmp = *ctl;
2773 2773
2774 tmp.extra1 = &zero; 2774 tmp.extra1 = &zero;
2775 tmp.extra2 = &unres_qlen_max; 2775 tmp.extra2 = &unres_qlen_max;
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 4b48f39582b0..637a42e5d589 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -24,12 +24,12 @@
24static int one = 1; 24static int one = 1;
25 25
26#ifdef CONFIG_RPS 26#ifdef CONFIG_RPS
27static int rps_sock_flow_sysctl(ctl_table *table, int write, 27static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
28 void __user *buffer, size_t *lenp, loff_t *ppos) 28 void __user *buffer, size_t *lenp, loff_t *ppos)
29{ 29{
30 unsigned int orig_size, size; 30 unsigned int orig_size, size;
31 int ret, i; 31 int ret, i;
32 ctl_table tmp = { 32 struct ctl_table tmp = {
33 .data = &size, 33 .data = &size,
34 .maxlen = sizeof(size), 34 .maxlen = sizeof(size),
35 .mode = table->mode 35 .mode = table->mode
@@ -91,7 +91,7 @@ static int rps_sock_flow_sysctl(ctl_table *table, int write,
91#ifdef CONFIG_NET_FLOW_LIMIT 91#ifdef CONFIG_NET_FLOW_LIMIT
92static DEFINE_MUTEX(flow_limit_update_mutex); 92static DEFINE_MUTEX(flow_limit_update_mutex);
93 93
94static int flow_limit_cpu_sysctl(ctl_table *table, int write, 94static int flow_limit_cpu_sysctl(struct ctl_table *table, int write,
95 void __user *buffer, size_t *lenp, 95 void __user *buffer, size_t *lenp,
96 loff_t *ppos) 96 loff_t *ppos)
97{ 97{
@@ -156,7 +156,7 @@ done:
156 return ret; 156 return ret;
157} 157}
158 158
159static int flow_limit_table_len_sysctl(ctl_table *table, int write, 159static int flow_limit_table_len_sysctl(struct ctl_table *table, int write,
160 void __user *buffer, size_t *lenp, 160 void __user *buffer, size_t *lenp,
161 loff_t *ppos) 161 loff_t *ppos)
162{ 162{
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 7d9197063ebb..dd0dfb25f4b1 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -158,11 +158,11 @@ static int max_t3[] = { 8191 }; /* Must fit in 16 bits when multiplied by BCT3MU
158static int min_priority[1]; 158static int min_priority[1];
159static int max_priority[] = { 127 }; /* From DECnet spec */ 159static int max_priority[] = { 127 }; /* From DECnet spec */
160 160
161static int dn_forwarding_proc(ctl_table *, int, 161static int dn_forwarding_proc(struct ctl_table *, int,
162 void __user *, size_t *, loff_t *); 162 void __user *, size_t *, loff_t *);
163static struct dn_dev_sysctl_table { 163static struct dn_dev_sysctl_table {
164 struct ctl_table_header *sysctl_header; 164 struct ctl_table_header *sysctl_header;
165 ctl_table dn_dev_vars[5]; 165 struct ctl_table dn_dev_vars[5];
166} dn_dev_sysctl = { 166} dn_dev_sysctl = {
167 NULL, 167 NULL,
168 { 168 {
@@ -242,7 +242,7 @@ static void dn_dev_sysctl_unregister(struct dn_dev_parms *parms)
242 } 242 }
243} 243}
244 244
245static int dn_forwarding_proc(ctl_table *table, int write, 245static int dn_forwarding_proc(struct ctl_table *table, int write,
246 void __user *buffer, 246 void __user *buffer,
247 size_t *lenp, loff_t *ppos) 247 size_t *lenp, loff_t *ppos)
248{ 248{
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index a55eeccaa72f..5325b541c526 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -132,7 +132,7 @@ static int parse_addr(__le16 *addr, char *str)
132 return 0; 132 return 0;
133} 133}
134 134
135static int dn_node_address_handler(ctl_table *table, int write, 135static int dn_node_address_handler(struct ctl_table *table, int write,
136 void __user *buffer, 136 void __user *buffer,
137 size_t *lenp, loff_t *ppos) 137 size_t *lenp, loff_t *ppos)
138{ 138{
@@ -183,7 +183,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
183 return 0; 183 return 0;
184} 184}
185 185
186static int dn_def_dev_handler(ctl_table *table, int write, 186static int dn_def_dev_handler(struct ctl_table *table, int write,
187 void __user *buffer, 187 void __user *buffer,
188 size_t *lenp, loff_t *ppos) 188 size_t *lenp, loff_t *ppos)
189{ 189{
@@ -246,7 +246,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
246 return 0; 246 return 0;
247} 247}
248 248
249static ctl_table dn_table[] = { 249static struct ctl_table dn_table[] = {
250 { 250 {
251 .procname = "node_address", 251 .procname = "node_address",
252 .maxlen = 7, 252 .maxlen = 7,
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 3469506c106d..8d48c392adcc 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1942,7 +1942,7 @@ static void inet_forward_change(struct net *net)
1942 } 1942 }
1943} 1943}
1944 1944
1945static int devinet_conf_proc(ctl_table *ctl, int write, 1945static int devinet_conf_proc(struct ctl_table *ctl, int write,
1946 void __user *buffer, 1946 void __user *buffer,
1947 size_t *lenp, loff_t *ppos) 1947 size_t *lenp, loff_t *ppos)
1948{ 1948{
@@ -1985,7 +1985,7 @@ static int devinet_conf_proc(ctl_table *ctl, int write,
1985 return ret; 1985 return ret;
1986} 1986}
1987 1987
1988static int devinet_sysctl_forward(ctl_table *ctl, int write, 1988static int devinet_sysctl_forward(struct ctl_table *ctl, int write,
1989 void __user *buffer, 1989 void __user *buffer,
1990 size_t *lenp, loff_t *ppos) 1990 size_t *lenp, loff_t *ppos)
1991{ 1991{
@@ -2028,7 +2028,7 @@ static int devinet_sysctl_forward(ctl_table *ctl, int write,
2028 return ret; 2028 return ret;
2029} 2029}
2030 2030
2031static int ipv4_doint_and_flush(ctl_table *ctl, int write, 2031static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
2032 void __user *buffer, 2032 void __user *buffer,
2033 size_t *lenp, loff_t *ppos) 2033 size_t *lenp, loff_t *ppos)
2034{ 2034{
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 567d84168bd2..0a2e0e3e95ba 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -223,7 +223,7 @@ static struct nf_hook_ops ipv4_conntrack_ops[] __read_mostly = {
223static int log_invalid_proto_min = 0; 223static int log_invalid_proto_min = 0;
224static int log_invalid_proto_max = 255; 224static int log_invalid_proto_max = 255;
225 225
226static ctl_table ip_ct_sysctl_table[] = { 226static struct ctl_table ip_ct_sysctl_table[] = {
227 { 227 {
228 .procname = "ip_conntrack_max", 228 .procname = "ip_conntrack_max",
229 .maxlen = sizeof(int), 229 .maxlen = sizeof(int),
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 198ea596f2d9..f3fa42eac461 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2448,7 +2448,7 @@ static int ip_rt_gc_interval __read_mostly = 60 * HZ;
2448static int ip_rt_gc_min_interval __read_mostly = HZ / 2; 2448static int ip_rt_gc_min_interval __read_mostly = HZ / 2;
2449static int ip_rt_gc_elasticity __read_mostly = 8; 2449static int ip_rt_gc_elasticity __read_mostly = 8;
2450 2450
2451static int ipv4_sysctl_rtcache_flush(ctl_table *__ctl, int write, 2451static int ipv4_sysctl_rtcache_flush(struct ctl_table *__ctl, int write,
2452 void __user *buffer, 2452 void __user *buffer,
2453 size_t *lenp, loff_t *ppos) 2453 size_t *lenp, loff_t *ppos)
2454{ 2454{
@@ -2463,7 +2463,7 @@ static int ipv4_sysctl_rtcache_flush(ctl_table *__ctl, int write,
2463 return -EINVAL; 2463 return -EINVAL;
2464} 2464}
2465 2465
2466static ctl_table ipv4_route_table[] = { 2466static struct ctl_table ipv4_route_table[] = {
2467 { 2467 {
2468 .procname = "gc_thresh", 2468 .procname = "gc_thresh",
2469 .data = &ipv4_dst_ops.gc_thresh, 2469 .data = &ipv4_dst_ops.gc_thresh,
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index fa2f63fc453b..b2c123c44d69 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -49,13 +49,13 @@ static void set_local_port_range(int range[2])
49} 49}
50 50
51/* Validate changes from /proc interface. */ 51/* Validate changes from /proc interface. */
52static int ipv4_local_port_range(ctl_table *table, int write, 52static int ipv4_local_port_range(struct ctl_table *table, int write,
53 void __user *buffer, 53 void __user *buffer,
54 size_t *lenp, loff_t *ppos) 54 size_t *lenp, loff_t *ppos)
55{ 55{
56 int ret; 56 int ret;
57 int range[2]; 57 int range[2];
58 ctl_table tmp = { 58 struct ctl_table tmp = {
59 .data = &range, 59 .data = &range,
60 .maxlen = sizeof(range), 60 .maxlen = sizeof(range),
61 .mode = table->mode, 61 .mode = table->mode,
@@ -100,7 +100,7 @@ static void set_ping_group_range(struct ctl_table *table, kgid_t low, kgid_t hig
100} 100}
101 101
102/* Validate changes from /proc interface. */ 102/* Validate changes from /proc interface. */
103static int ipv4_ping_group_range(ctl_table *table, int write, 103static int ipv4_ping_group_range(struct ctl_table *table, int write,
104 void __user *buffer, 104 void __user *buffer,
105 size_t *lenp, loff_t *ppos) 105 size_t *lenp, loff_t *ppos)
106{ 106{
@@ -108,7 +108,7 @@ static int ipv4_ping_group_range(ctl_table *table, int write,
108 int ret; 108 int ret;
109 gid_t urange[2]; 109 gid_t urange[2];
110 kgid_t low, high; 110 kgid_t low, high;
111 ctl_table tmp = { 111 struct ctl_table tmp = {
112 .data = &urange, 112 .data = &urange,
113 .maxlen = sizeof(urange), 113 .maxlen = sizeof(urange),
114 .mode = table->mode, 114 .mode = table->mode,
@@ -135,11 +135,11 @@ static int ipv4_ping_group_range(ctl_table *table, int write,
135 return ret; 135 return ret;
136} 136}
137 137
138static int proc_tcp_congestion_control(ctl_table *ctl, int write, 138static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
139 void __user *buffer, size_t *lenp, loff_t *ppos) 139 void __user *buffer, size_t *lenp, loff_t *ppos)
140{ 140{
141 char val[TCP_CA_NAME_MAX]; 141 char val[TCP_CA_NAME_MAX];
142 ctl_table tbl = { 142 struct ctl_table tbl = {
143 .data = val, 143 .data = val,
144 .maxlen = TCP_CA_NAME_MAX, 144 .maxlen = TCP_CA_NAME_MAX,
145 }; 145 };
@@ -153,12 +153,12 @@ static int proc_tcp_congestion_control(ctl_table *ctl, int write,
153 return ret; 153 return ret;
154} 154}
155 155
156static int proc_tcp_available_congestion_control(ctl_table *ctl, 156static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
157 int write, 157 int write,
158 void __user *buffer, size_t *lenp, 158 void __user *buffer, size_t *lenp,
159 loff_t *ppos) 159 loff_t *ppos)
160{ 160{
161 ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, }; 161 struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
162 int ret; 162 int ret;
163 163
164 tbl.data = kmalloc(tbl.maxlen, GFP_USER); 164 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
@@ -170,12 +170,12 @@ static int proc_tcp_available_congestion_control(ctl_table *ctl,
170 return ret; 170 return ret;
171} 171}
172 172
173static int proc_allowed_congestion_control(ctl_table *ctl, 173static int proc_allowed_congestion_control(struct ctl_table *ctl,
174 int write, 174 int write,
175 void __user *buffer, size_t *lenp, 175 void __user *buffer, size_t *lenp,
176 loff_t *ppos) 176 loff_t *ppos)
177{ 177{
178 ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX }; 178 struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
179 int ret; 179 int ret;
180 180
181 tbl.data = kmalloc(tbl.maxlen, GFP_USER); 181 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
@@ -190,7 +190,7 @@ static int proc_allowed_congestion_control(ctl_table *ctl,
190 return ret; 190 return ret;
191} 191}
192 192
193static int ipv4_tcp_mem(ctl_table *ctl, int write, 193static int ipv4_tcp_mem(struct ctl_table *ctl, int write,
194 void __user *buffer, size_t *lenp, 194 void __user *buffer, size_t *lenp,
195 loff_t *ppos) 195 loff_t *ppos)
196{ 196{
@@ -201,7 +201,7 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
201 struct mem_cgroup *memcg; 201 struct mem_cgroup *memcg;
202#endif 202#endif
203 203
204 ctl_table tmp = { 204 struct ctl_table tmp = {
205 .data = &vec, 205 .data = &vec,
206 .maxlen = sizeof(vec), 206 .maxlen = sizeof(vec),
207 .mode = ctl->mode, 207 .mode = ctl->mode,
@@ -233,10 +233,11 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
233 return 0; 233 return 0;
234} 234}
235 235
236static int proc_tcp_fastopen_key(ctl_table *ctl, int write, void __user *buffer, 236static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
237 size_t *lenp, loff_t *ppos) 237 void __user *buffer, size_t *lenp,
238 loff_t *ppos)
238{ 239{
239 ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) }; 240 struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
240 struct tcp_fastopen_context *ctxt; 241 struct tcp_fastopen_context *ctxt;
241 int ret; 242 int ret;
242 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */ 243 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 21010fddb203..80449121afa2 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4620,13 +4620,13 @@ static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
4620#ifdef CONFIG_SYSCTL 4620#ifdef CONFIG_SYSCTL
4621 4621
4622static 4622static
4623int addrconf_sysctl_forward(ctl_table *ctl, int write, 4623int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
4624 void __user *buffer, size_t *lenp, loff_t *ppos) 4624 void __user *buffer, size_t *lenp, loff_t *ppos)
4625{ 4625{
4626 int *valp = ctl->data; 4626 int *valp = ctl->data;
4627 int val = *valp; 4627 int val = *valp;
4628 loff_t pos = *ppos; 4628 loff_t pos = *ppos;
4629 ctl_table lctl; 4629 struct ctl_table lctl;
4630 int ret; 4630 int ret;
4631 4631
4632 /* 4632 /*
@@ -4705,13 +4705,13 @@ static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int newf)
4705} 4705}
4706 4706
4707static 4707static
4708int addrconf_sysctl_disable(ctl_table *ctl, int write, 4708int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
4709 void __user *buffer, size_t *lenp, loff_t *ppos) 4709 void __user *buffer, size_t *lenp, loff_t *ppos)
4710{ 4710{
4711 int *valp = ctl->data; 4711 int *valp = ctl->data;
4712 int val = *valp; 4712 int val = *valp;
4713 loff_t pos = *ppos; 4713 loff_t pos = *ppos;
4714 ctl_table lctl; 4714 struct ctl_table lctl;
4715 int ret; 4715 int ret;
4716 4716
4717 /* 4717 /*
@@ -4733,7 +4733,7 @@ int addrconf_sysctl_disable(ctl_table *ctl, int write,
4733static struct addrconf_sysctl_table 4733static struct addrconf_sysctl_table
4734{ 4734{
4735 struct ctl_table_header *sysctl_header; 4735 struct ctl_table_header *sysctl_header;
4736 ctl_table addrconf_vars[DEVCONF_MAX+1]; 4736 struct ctl_table addrconf_vars[DEVCONF_MAX+1];
4737} addrconf_sysctl __read_mostly = { 4737} addrconf_sysctl __read_mostly = {
4738 .sysctl_header = NULL, 4738 .sysctl_header = NULL,
4739 .addrconf_vars = { 4739 .addrconf_vars = {
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 4b4890bbe16d..7cfc8d284870 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -976,7 +976,7 @@ int icmpv6_err_convert(u8 type, u8 code, int *err)
976EXPORT_SYMBOL(icmpv6_err_convert); 976EXPORT_SYMBOL(icmpv6_err_convert);
977 977
978#ifdef CONFIG_SYSCTL 978#ifdef CONFIG_SYSCTL
979ctl_table ipv6_icmp_table_template[] = { 979struct ctl_table ipv6_icmp_table_template[] = {
980 { 980 {
981 .procname = "ratelimit", 981 .procname = "ratelimit",
982 .data = &init_net.ipv6.sysctl.icmpv6_time, 982 .data = &init_net.ipv6.sysctl.icmpv6_time,
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 2b874185ebb2..7ca87b37c0ef 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2790,7 +2790,7 @@ static const struct file_operations rt6_stats_seq_fops = {
2790#ifdef CONFIG_SYSCTL 2790#ifdef CONFIG_SYSCTL
2791 2791
2792static 2792static
2793int ipv6_sysctl_rtcache_flush(ctl_table *ctl, int write, 2793int ipv6_sysctl_rtcache_flush(struct ctl_table *ctl, int write,
2794 void __user *buffer, size_t *lenp, loff_t *ppos) 2794 void __user *buffer, size_t *lenp, loff_t *ppos)
2795{ 2795{
2796 struct net *net; 2796 struct net *net;
@@ -2805,7 +2805,7 @@ int ipv6_sysctl_rtcache_flush(ctl_table *ctl, int write,
2805 return 0; 2805 return 0;
2806} 2806}
2807 2807
2808ctl_table ipv6_route_table_template[] = { 2808struct ctl_table ipv6_route_table_template[] = {
2809 { 2809 {
2810 .procname = "flush", 2810 .procname = "flush",
2811 .data = &init_net.ipv6.sysctl.flush_delay, 2811 .data = &init_net.ipv6.sysctl.flush_delay,
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index e85c48bd404f..107b2f1d90ae 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -16,7 +16,7 @@
16#include <net/addrconf.h> 16#include <net/addrconf.h>
17#include <net/inet_frag.h> 17#include <net/inet_frag.h>
18 18
19static ctl_table ipv6_table_template[] = { 19static struct ctl_table ipv6_table_template[] = {
20 { 20 {
21 .procname = "bindv6only", 21 .procname = "bindv6only",
22 .data = &init_net.ipv6.sysctl.bindv6only, 22 .data = &init_net.ipv6.sysctl.bindv6only,
@@ -27,7 +27,7 @@ static ctl_table ipv6_table_template[] = {
27 { } 27 { }
28}; 28};
29 29
30static ctl_table ipv6_rotable[] = { 30static struct ctl_table ipv6_rotable[] = {
31 { 31 {
32 .procname = "mld_max_msf", 32 .procname = "mld_max_msf",
33 .data = &sysctl_mld_max_msf, 33 .data = &sysctl_mld_max_msf,
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index de73f6496db5..d6a59651767a 100644
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -73,7 +73,7 @@ static int min_lap_keepalive_time = 100; /* 100us */
73/* For other sysctl, I've no idea of the range. Maybe Dag could help 73/* For other sysctl, I've no idea of the range. Maybe Dag could help
74 * us on that - Jean II */ 74 * us on that - Jean II */
75 75
76static int do_devname(ctl_table *table, int write, 76static int do_devname(struct ctl_table *table, int write,
77 void __user *buffer, size_t *lenp, loff_t *ppos) 77 void __user *buffer, size_t *lenp, loff_t *ppos)
78{ 78{
79 int ret; 79 int ret;
@@ -90,7 +90,7 @@ static int do_devname(ctl_table *table, int write,
90} 90}
91 91
92 92
93static int do_discovery(ctl_table *table, int write, 93static int do_discovery(struct ctl_table *table, int write,
94 void __user *buffer, size_t *lenp, loff_t *ppos) 94 void __user *buffer, size_t *lenp, loff_t *ppos)
95{ 95{
96 int ret; 96 int ret;
@@ -111,7 +111,7 @@ static int do_discovery(ctl_table *table, int write,
111} 111}
112 112
113/* One file */ 113/* One file */
114static ctl_table irda_table[] = { 114static struct ctl_table irda_table[] = {
115 { 115 {
116 .procname = "discovery", 116 .procname = "discovery",
117 .data = &sysctl_discovery, 117 .data = &sysctl_discovery,
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index df05c1c276f0..edb88fbcb1bd 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1575,7 +1575,7 @@ static int zero;
1575static int three = 3; 1575static int three = 3;
1576 1576
1577static int 1577static int
1578proc_do_defense_mode(ctl_table *table, int write, 1578proc_do_defense_mode(struct ctl_table *table, int write,
1579 void __user *buffer, size_t *lenp, loff_t *ppos) 1579 void __user *buffer, size_t *lenp, loff_t *ppos)
1580{ 1580{
1581 struct net *net = current->nsproxy->net_ns; 1581 struct net *net = current->nsproxy->net_ns;
@@ -1596,7 +1596,7 @@ proc_do_defense_mode(ctl_table *table, int write,
1596} 1596}
1597 1597
1598static int 1598static int
1599proc_do_sync_threshold(ctl_table *table, int write, 1599proc_do_sync_threshold(struct ctl_table *table, int write,
1600 void __user *buffer, size_t *lenp, loff_t *ppos) 1600 void __user *buffer, size_t *lenp, loff_t *ppos)
1601{ 1601{
1602 int *valp = table->data; 1602 int *valp = table->data;
@@ -1616,7 +1616,7 @@ proc_do_sync_threshold(ctl_table *table, int write,
1616} 1616}
1617 1617
1618static int 1618static int
1619proc_do_sync_mode(ctl_table *table, int write, 1619proc_do_sync_mode(struct ctl_table *table, int write,
1620 void __user *buffer, size_t *lenp, loff_t *ppos) 1620 void __user *buffer, size_t *lenp, loff_t *ppos)
1621{ 1621{
1622 int *valp = table->data; 1622 int *valp = table->data;
@@ -1634,7 +1634,7 @@ proc_do_sync_mode(ctl_table *table, int write,
1634} 1634}
1635 1635
1636static int 1636static int
1637proc_do_sync_ports(ctl_table *table, int write, 1637proc_do_sync_ports(struct ctl_table *table, int write,
1638 void __user *buffer, size_t *lenp, loff_t *ppos) 1638 void __user *buffer, size_t *lenp, loff_t *ppos)
1639{ 1639{
1640 int *valp = table->data; 1640 int *valp = table->data;
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index 5ea26bd87743..44595b8ae37f 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
118 * IPVS LBLC sysctl table 118 * IPVS LBLC sysctl table
119 */ 119 */
120#ifdef CONFIG_SYSCTL 120#ifdef CONFIG_SYSCTL
121static ctl_table vs_vars_table[] = { 121static struct ctl_table vs_vars_table[] = {
122 { 122 {
123 .procname = "lblc_expiration", 123 .procname = "lblc_expiration",
124 .data = NULL, 124 .data = NULL,
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index 50123c2ab484..876937db0bf4 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -299,7 +299,7 @@ struct ip_vs_lblcr_table {
299 * IPVS LBLCR sysctl table 299 * IPVS LBLCR sysctl table
300 */ 300 */
301 301
302static ctl_table vs_vars_table[] = { 302static struct ctl_table vs_vars_table[] = {
303 { 303 {
304 .procname = "lblcr_expiration", 304 .procname = "lblcr_expiration",
305 .data = NULL, 305 .data = NULL,
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index bd700b4013c1..f641751dba9d 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -408,7 +408,7 @@ static int log_invalid_proto_max = 255;
408 408
409static struct ctl_table_header *nf_ct_netfilter_header; 409static struct ctl_table_header *nf_ct_netfilter_header;
410 410
411static ctl_table nf_ct_sysctl_table[] = { 411static struct ctl_table nf_ct_sysctl_table[] = {
412 { 412 {
413 .procname = "nf_conntrack_max", 413 .procname = "nf_conntrack_max",
414 .data = &nf_conntrack_max, 414 .data = &nf_conntrack_max,
@@ -458,7 +458,7 @@ static ctl_table nf_ct_sysctl_table[] = {
458 458
459#define NET_NF_CONNTRACK_MAX 2089 459#define NET_NF_CONNTRACK_MAX 2089
460 460
461static ctl_table nf_ct_netfilter_table[] = { 461static struct ctl_table nf_ct_netfilter_table[] = {
462 { 462 {
463 .procname = "nf_conntrack_max", 463 .procname = "nf_conntrack_max",
464 .data = &nf_conntrack_max, 464 .data = &nf_conntrack_max,
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index 4b60a87b7596..85296d4eac0e 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -245,7 +245,7 @@ static const struct file_operations nflog_file_ops = {
245static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3]; 245static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
246static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1]; 246static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
247 247
248static int nf_log_proc_dostring(ctl_table *table, int write, 248static int nf_log_proc_dostring(struct ctl_table *table, int write,
249 void __user *buffer, size_t *lenp, loff_t *ppos) 249 void __user *buffer, size_t *lenp, loff_t *ppos)
250{ 250{
251 const struct nf_logger *logger; 251 const struct nf_logger *logger;
diff --git a/net/netrom/sysctl_net_netrom.c b/net/netrom/sysctl_net_netrom.c
index 42f630b9a698..ba1c368b3f18 100644
--- a/net/netrom/sysctl_net_netrom.c
+++ b/net/netrom/sysctl_net_netrom.c
@@ -34,7 +34,7 @@ static int min_reset[] = {0}, max_reset[] = {1};
34 34
35static struct ctl_table_header *nr_table_header; 35static struct ctl_table_header *nr_table_header;
36 36
37static ctl_table nr_table[] = { 37static struct ctl_table nr_table[] = {
38 { 38 {
39 .procname = "default_path_quality", 39 .procname = "default_path_quality",
40 .data = &sysctl_netrom_default_path_quality, 40 .data = &sysctl_netrom_default_path_quality,
diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
index d6bbbbd0af18..c02a8c4bc11f 100644
--- a/net/phonet/sysctl.c
+++ b/net/phonet/sysctl.c
@@ -61,13 +61,13 @@ void phonet_get_local_port_range(int *min, int *max)
61 } while (read_seqretry(&local_port_range_lock, seq)); 61 } while (read_seqretry(&local_port_range_lock, seq));
62} 62}
63 63
64static int proc_local_port_range(ctl_table *table, int write, 64static int proc_local_port_range(struct ctl_table *table, int write,
65 void __user *buffer, 65 void __user *buffer,
66 size_t *lenp, loff_t *ppos) 66 size_t *lenp, loff_t *ppos)
67{ 67{
68 int ret; 68 int ret;
69 int range[2] = {local_port_range[0], local_port_range[1]}; 69 int range[2] = {local_port_range[0], local_port_range[1]};
70 ctl_table tmp = { 70 struct ctl_table tmp = {
71 .data = &range, 71 .data = &range,
72 .maxlen = sizeof(range), 72 .maxlen = sizeof(range),
73 .mode = table->mode, 73 .mode = table->mode,
diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c
index 7e643bafb4af..e4e41b3afce7 100644
--- a/net/rds/ib_sysctl.c
+++ b/net/rds/ib_sysctl.c
@@ -61,7 +61,7 @@ static unsigned long rds_ib_sysctl_max_unsig_wr_max = 64;
61 */ 61 */
62unsigned int rds_ib_sysctl_flow_control = 0; 62unsigned int rds_ib_sysctl_flow_control = 0;
63 63
64static ctl_table rds_ib_sysctl_table[] = { 64static struct ctl_table rds_ib_sysctl_table[] = {
65 { 65 {
66 .procname = "max_send_wr", 66 .procname = "max_send_wr",
67 .data = &rds_ib_sysctl_max_send_wr, 67 .data = &rds_ib_sysctl_max_send_wr,
diff --git a/net/rds/iw_sysctl.c b/net/rds/iw_sysctl.c
index 5d5ebd576f3f..89c91515ed0c 100644
--- a/net/rds/iw_sysctl.c
+++ b/net/rds/iw_sysctl.c
@@ -55,7 +55,7 @@ static unsigned long rds_iw_sysctl_max_unsig_bytes_max = ~0UL;
55 55
56unsigned int rds_iw_sysctl_flow_control = 1; 56unsigned int rds_iw_sysctl_flow_control = 1;
57 57
58static ctl_table rds_iw_sysctl_table[] = { 58static struct ctl_table rds_iw_sysctl_table[] = {
59 { 59 {
60 .procname = "max_send_wr", 60 .procname = "max_send_wr",
61 .data = &rds_iw_sysctl_max_send_wr, 61 .data = &rds_iw_sysctl_max_send_wr,
diff --git a/net/rds/sysctl.c b/net/rds/sysctl.c
index 907214b4c4d0..b5cb2aa08f33 100644
--- a/net/rds/sysctl.c
+++ b/net/rds/sysctl.c
@@ -49,7 +49,7 @@ unsigned int rds_sysctl_max_unacked_bytes = (16 << 20);
49 49
50unsigned int rds_sysctl_ping_enable = 1; 50unsigned int rds_sysctl_ping_enable = 1;
51 51
52static ctl_table rds_sysctl_rds_table[] = { 52static struct ctl_table rds_sysctl_rds_table[] = {
53 { 53 {
54 .procname = "reconnect_min_delay_ms", 54 .procname = "reconnect_min_delay_ms",
55 .data = &rds_sysctl_reconnect_min_jiffies, 55 .data = &rds_sysctl_reconnect_min_jiffies,
diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c
index 94ca9c2ccd69..89a9278795a9 100644
--- a/net/rose/sysctl_net_rose.c
+++ b/net/rose/sysctl_net_rose.c
@@ -24,7 +24,7 @@ static int min_window[] = {1}, max_window[] = {7};
24 24
25static struct ctl_table_header *rose_table_header; 25static struct ctl_table_header *rose_table_header;
26 26
27static ctl_table rose_table[] = { 27static struct ctl_table rose_table[] = {
28 { 28 {
29 .procname = "restart_request_timeout", 29 .procname = "restart_request_timeout",
30 .data = &sysctl_rose_restart_request_timeout, 30 .data = &sysctl_rose_restart_request_timeout,
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index bf3c6e8fc401..9a5c4c9eddaf 100644
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -62,12 +62,12 @@ extern long sysctl_sctp_mem[3];
62extern int sysctl_sctp_rmem[3]; 62extern int sysctl_sctp_rmem[3];
63extern int sysctl_sctp_wmem[3]; 63extern int sysctl_sctp_wmem[3];
64 64
65static int proc_sctp_do_hmac_alg(ctl_table *ctl, 65static int proc_sctp_do_hmac_alg(struct ctl_table *ctl,
66 int write, 66 int write,
67 void __user *buffer, size_t *lenp, 67 void __user *buffer, size_t *lenp,
68 68
69 loff_t *ppos); 69 loff_t *ppos);
70static ctl_table sctp_table[] = { 70static struct ctl_table sctp_table[] = {
71 { 71 {
72 .procname = "sctp_mem", 72 .procname = "sctp_mem",
73 .data = &sysctl_sctp_mem, 73 .data = &sysctl_sctp_mem,
@@ -93,7 +93,7 @@ static ctl_table sctp_table[] = {
93 { /* sentinel */ } 93 { /* sentinel */ }
94}; 94};
95 95
96static ctl_table sctp_net_table[] = { 96static struct ctl_table sctp_net_table[] = {
97 { 97 {
98 .procname = "rto_initial", 98 .procname = "rto_initial",
99 .data = &init_net.sctp.rto_initial, 99 .data = &init_net.sctp.rto_initial,
@@ -300,14 +300,14 @@ static ctl_table sctp_net_table[] = {
300 { /* sentinel */ } 300 { /* sentinel */ }
301}; 301};
302 302
303static int proc_sctp_do_hmac_alg(ctl_table *ctl, 303static int proc_sctp_do_hmac_alg(struct ctl_table *ctl,
304 int write, 304 int write,
305 void __user *buffer, size_t *lenp, 305 void __user *buffer, size_t *lenp,
306 loff_t *ppos) 306 loff_t *ppos)
307{ 307{
308 struct net *net = current->nsproxy->net_ns; 308 struct net *net = current->nsproxy->net_ns;
309 char tmp[8]; 309 char tmp[8];
310 ctl_table tbl; 310 struct ctl_table tbl;
311 int ret; 311 int ret;
312 int changed = 0; 312 int changed = 0;
313 char *none = "none"; 313 char *none = "none";
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index af7d339add9d..c99c58e2ee66 100644
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -40,7 +40,7 @@ EXPORT_SYMBOL_GPL(nlm_debug);
40#ifdef RPC_DEBUG 40#ifdef RPC_DEBUG
41 41
42static struct ctl_table_header *sunrpc_table_header; 42static struct ctl_table_header *sunrpc_table_header;
43static ctl_table sunrpc_table[]; 43static struct ctl_table sunrpc_table[];
44 44
45void 45void
46rpc_register_sysctl(void) 46rpc_register_sysctl(void)
@@ -58,7 +58,7 @@ rpc_unregister_sysctl(void)
58 } 58 }
59} 59}
60 60
61static int proc_do_xprt(ctl_table *table, int write, 61static int proc_do_xprt(struct ctl_table *table, int write,
62 void __user *buffer, size_t *lenp, loff_t *ppos) 62 void __user *buffer, size_t *lenp, loff_t *ppos)
63{ 63{
64 char tmpbuf[256]; 64 char tmpbuf[256];
@@ -73,7 +73,7 @@ static int proc_do_xprt(ctl_table *table, int write,
73} 73}
74 74
75static int 75static int
76proc_dodebug(ctl_table *table, int write, 76proc_dodebug(struct ctl_table *table, int write,
77 void __user *buffer, size_t *lenp, loff_t *ppos) 77 void __user *buffer, size_t *lenp, loff_t *ppos)
78{ 78{
79 char tmpbuf[20], c, *s; 79 char tmpbuf[20], c, *s;
@@ -135,7 +135,7 @@ done:
135} 135}
136 136
137 137
138static ctl_table debug_table[] = { 138static struct ctl_table debug_table[] = {
139 { 139 {
140 .procname = "rpc_debug", 140 .procname = "rpc_debug",
141 .data = &rpc_debug, 141 .data = &rpc_debug,
@@ -173,7 +173,7 @@ static ctl_table debug_table[] = {
173 { } 173 { }
174}; 174};
175 175
176static ctl_table sunrpc_table[] = { 176static struct ctl_table sunrpc_table[] = {
177 { 177 {
178 .procname = "sunrpc", 178 .procname = "sunrpc",
179 .mode = 0555, 179 .mode = 0555,
diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
index 8343737e85f4..c1b6270262c2 100644
--- a/net/sunrpc/xprtrdma/svc_rdma.c
+++ b/net/sunrpc/xprtrdma/svc_rdma.c
@@ -84,7 +84,7 @@ struct workqueue_struct *svc_rdma_wq;
84 * resets the associated statistic to zero. Any read returns it's 84 * resets the associated statistic to zero. Any read returns it's
85 * current value. 85 * current value.
86 */ 86 */
87static int read_reset_stat(ctl_table *table, int write, 87static int read_reset_stat(struct ctl_table *table, int write,
88 void __user *buffer, size_t *lenp, 88 void __user *buffer, size_t *lenp,
89 loff_t *ppos) 89 loff_t *ppos)
90{ 90{
@@ -119,7 +119,7 @@ static int read_reset_stat(ctl_table *table, int write,
119} 119}
120 120
121static struct ctl_table_header *svcrdma_table_header; 121static struct ctl_table_header *svcrdma_table_header;
122static ctl_table svcrdma_parm_table[] = { 122static struct ctl_table svcrdma_parm_table[] = {
123 { 123 {
124 .procname = "max_requests", 124 .procname = "max_requests",
125 .data = &svcrdma_max_requests, 125 .data = &svcrdma_max_requests,
@@ -214,7 +214,7 @@ static ctl_table svcrdma_parm_table[] = {
214 { }, 214 { },
215}; 215};
216 216
217static ctl_table svcrdma_table[] = { 217static struct ctl_table svcrdma_table[] = {
218 { 218 {
219 .procname = "svc_rdma", 219 .procname = "svc_rdma",
220 .mode = 0555, 220 .mode = 0555,
@@ -223,7 +223,7 @@ static ctl_table svcrdma_table[] = {
223 { }, 223 { },
224}; 224};
225 225
226static ctl_table svcrdma_root_table[] = { 226static struct ctl_table svcrdma_root_table[] = {
227 { 227 {
228 .procname = "sunrpc", 228 .procname = "sunrpc",
229 .mode = 0555, 229 .mode = 0555,
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 794312f22b9b..285dc0884115 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -86,7 +86,7 @@ static unsigned int max_memreg = RPCRDMA_LAST - 1;
86 86
87static struct ctl_table_header *sunrpc_table_header; 87static struct ctl_table_header *sunrpc_table_header;
88 88
89static ctl_table xr_tunables_table[] = { 89static struct ctl_table xr_tunables_table[] = {
90 { 90 {
91 .procname = "rdma_slot_table_entries", 91 .procname = "rdma_slot_table_entries",
92 .data = &xprt_rdma_slot_table_entries, 92 .data = &xprt_rdma_slot_table_entries,
@@ -138,7 +138,7 @@ static ctl_table xr_tunables_table[] = {
138 { }, 138 { },
139}; 139};
140 140
141static ctl_table sunrpc_table[] = { 141static struct ctl_table sunrpc_table[] = {
142 { 142 {
143 .procname = "sunrpc", 143 .procname = "sunrpc",
144 .mode = 0555, 144 .mode = 0555,
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index ffd50348a509..412de7cfcc80 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -87,7 +87,7 @@ static struct ctl_table_header *sunrpc_table_header;
87 * FIXME: changing the UDP slot table size should also resize the UDP 87 * FIXME: changing the UDP slot table size should also resize the UDP
88 * socket buffers for existing UDP transports 88 * socket buffers for existing UDP transports
89 */ 89 */
90static ctl_table xs_tunables_table[] = { 90static struct ctl_table xs_tunables_table[] = {
91 { 91 {
92 .procname = "udp_slot_table_entries", 92 .procname = "udp_slot_table_entries",
93 .data = &xprt_udp_slot_table_entries, 93 .data = &xprt_udp_slot_table_entries,
@@ -143,7 +143,7 @@ static ctl_table xs_tunables_table[] = {
143 { }, 143 { },
144}; 144};
145 145
146static ctl_table sunrpc_table[] = { 146static struct ctl_table sunrpc_table[] = {
147 { 147 {
148 .procname = "sunrpc", 148 .procname = "sunrpc",
149 .mode = 0555, 149 .mode = 0555,
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 8800604c93f4..b3d515021b74 100644
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -15,7 +15,7 @@
15 15
16#include <net/af_unix.h> 16#include <net/af_unix.h>
17 17
18static ctl_table unix_table[] = { 18static struct ctl_table unix_table[] = {
19 { 19 {
20 .procname = "max_dgram_qlen", 20 .procname = "max_dgram_qlen",
21 .data = &init_net.unx.sysctl_max_dgram_qlen, 21 .data = &init_net.unx.sysctl_max_dgram_qlen,
generated by cgit v1.2.2 (git 2.25.0) at 2026-05-27 11:40:18 -0400