mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
net: Convert uses of typedef ctl_table to struct ctl_table
Reduce the uses of this unnecessary typedef.
Done via perl script:
$ git grep --name-only -w ctl_table net | \
xargs perl -p -i -e '\
sub trim { my ($local) = @_; $local =~ s/(^\s+|\s+$)//g; return $local; } \
s/\b(?<!struct\s)ctl_table\b(\s*\*\s*|\s+\w+)/"struct ctl_table " . trim($1)/ge'
Reflow the modified lines that now exceed 80 columns.
Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
194f4a6df2
commit
fe2c6338fd
32 changed files with 86 additions and 85 deletions
|
|
@ -1942,7 +1942,7 @@ static void inet_forward_change(struct net *net)
|
|||
}
|
||||
}
|
||||
|
||||
static int devinet_conf_proc(ctl_table *ctl, int write,
|
||||
static int devinet_conf_proc(struct ctl_table *ctl, int write,
|
||||
void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
|
|
@ -1985,7 +1985,7 @@ static int devinet_conf_proc(ctl_table *ctl, int write,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int devinet_sysctl_forward(ctl_table *ctl, int write,
|
||||
static int devinet_sysctl_forward(struct ctl_table *ctl, int write,
|
||||
void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
|
|
@ -2028,7 +2028,7 @@ static int devinet_sysctl_forward(ctl_table *ctl, int write,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int ipv4_doint_and_flush(ctl_table *ctl, int write,
|
||||
static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
|
||||
void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ static struct nf_hook_ops ipv4_conntrack_ops[] __read_mostly = {
|
|||
static int log_invalid_proto_min = 0;
|
||||
static int log_invalid_proto_max = 255;
|
||||
|
||||
static ctl_table ip_ct_sysctl_table[] = {
|
||||
static struct ctl_table ip_ct_sysctl_table[] = {
|
||||
{
|
||||
.procname = "ip_conntrack_max",
|
||||
.maxlen = sizeof(int),
|
||||
|
|
|
|||
|
|
@ -2448,7 +2448,7 @@ static int ip_rt_gc_interval __read_mostly = 60 * HZ;
|
|||
static int ip_rt_gc_min_interval __read_mostly = HZ / 2;
|
||||
static int ip_rt_gc_elasticity __read_mostly = 8;
|
||||
|
||||
static int ipv4_sysctl_rtcache_flush(ctl_table *__ctl, int write,
|
||||
static int ipv4_sysctl_rtcache_flush(struct ctl_table *__ctl, int write,
|
||||
void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
|
|
@ -2463,7 +2463,7 @@ static int ipv4_sysctl_rtcache_flush(ctl_table *__ctl, int write,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
static ctl_table ipv4_route_table[] = {
|
||||
static struct ctl_table ipv4_route_table[] = {
|
||||
{
|
||||
.procname = "gc_thresh",
|
||||
.data = &ipv4_dst_ops.gc_thresh,
|
||||
|
|
|
|||
|
|
@ -49,13 +49,13 @@ static void set_local_port_range(int range[2])
|
|||
}
|
||||
|
||||
/* Validate changes from /proc interface. */
|
||||
static int ipv4_local_port_range(ctl_table *table, int write,
|
||||
static int ipv4_local_port_range(struct ctl_table *table, int write,
|
||||
void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int ret;
|
||||
int range[2];
|
||||
ctl_table tmp = {
|
||||
struct ctl_table tmp = {
|
||||
.data = &range,
|
||||
.maxlen = sizeof(range),
|
||||
.mode = table->mode,
|
||||
|
|
@ -100,7 +100,7 @@ static void set_ping_group_range(struct ctl_table *table, kgid_t low, kgid_t hig
|
|||
}
|
||||
|
||||
/* Validate changes from /proc interface. */
|
||||
static int ipv4_ping_group_range(ctl_table *table, int write,
|
||||
static int ipv4_ping_group_range(struct ctl_table *table, int write,
|
||||
void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
|
|
@ -108,7 +108,7 @@ static int ipv4_ping_group_range(ctl_table *table, int write,
|
|||
int ret;
|
||||
gid_t urange[2];
|
||||
kgid_t low, high;
|
||||
ctl_table tmp = {
|
||||
struct ctl_table tmp = {
|
||||
.data = &urange,
|
||||
.maxlen = sizeof(urange),
|
||||
.mode = table->mode,
|
||||
|
|
@ -135,11 +135,11 @@ static int ipv4_ping_group_range(ctl_table *table, int write,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int proc_tcp_congestion_control(ctl_table *ctl, int write,
|
||||
static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
|
||||
void __user *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
char val[TCP_CA_NAME_MAX];
|
||||
ctl_table tbl = {
|
||||
struct ctl_table tbl = {
|
||||
.data = val,
|
||||
.maxlen = TCP_CA_NAME_MAX,
|
||||
};
|
||||
|
|
@ -153,12 +153,12 @@ static int proc_tcp_congestion_control(ctl_table *ctl, int write,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int proc_tcp_available_congestion_control(ctl_table *ctl,
|
||||
static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
|
||||
int write,
|
||||
void __user *buffer, size_t *lenp,
|
||||
loff_t *ppos)
|
||||
{
|
||||
ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
|
||||
struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
|
||||
int ret;
|
||||
|
||||
tbl.data = kmalloc(tbl.maxlen, GFP_USER);
|
||||
|
|
@ -170,12 +170,12 @@ static int proc_tcp_available_congestion_control(ctl_table *ctl,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int proc_allowed_congestion_control(ctl_table *ctl,
|
||||
static int proc_allowed_congestion_control(struct ctl_table *ctl,
|
||||
int write,
|
||||
void __user *buffer, size_t *lenp,
|
||||
loff_t *ppos)
|
||||
{
|
||||
ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
|
||||
struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
|
||||
int ret;
|
||||
|
||||
tbl.data = kmalloc(tbl.maxlen, GFP_USER);
|
||||
|
|
@ -190,7 +190,7 @@ static int proc_allowed_congestion_control(ctl_table *ctl,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int ipv4_tcp_mem(ctl_table *ctl, int write,
|
||||
static int ipv4_tcp_mem(struct ctl_table *ctl, int write,
|
||||
void __user *buffer, size_t *lenp,
|
||||
loff_t *ppos)
|
||||
{
|
||||
|
|
@ -201,7 +201,7 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
|
|||
struct mem_cgroup *memcg;
|
||||
#endif
|
||||
|
||||
ctl_table tmp = {
|
||||
struct ctl_table tmp = {
|
||||
.data = &vec,
|
||||
.maxlen = sizeof(vec),
|
||||
.mode = ctl->mode,
|
||||
|
|
@ -233,10 +233,11 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int proc_tcp_fastopen_key(ctl_table *ctl, int write, void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
|
||||
void __user *buffer, size_t *lenp,
|
||||
loff_t *ppos)
|
||||
{
|
||||
ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
|
||||
struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
|
||||
struct tcp_fastopen_context *ctxt;
|
||||
int ret;
|
||||
u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
|
||||
|
|
|
|||
Loading…
Reference in a new issue