Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe2c6338 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 194f4a6d

net/ax25/sysctl_net_ax25.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static int min_proto[1], max_proto[] = { AX25_PROTO_MAX }; 
static int min_ds_timeout[1],		max_ds_timeout[] = {65535000};

#endif



static const ctl_table ax25_param_table[] = {

static const struct ctl_table ax25_param_table[] = {

	{

		.procname	= "ip_default_mode",

		.maxlen		= sizeof(int),

net/bridge/br_netfilter.c

+2 −2
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ static struct nf_hook_ops br_nf_ops[] __read_mostly = { 


#ifdef CONFIG_SYSCTL

static

int brnf_sysctl_call_tables(ctl_table * ctl, int write,

int brnf_sysctl_call_tables(struct ctl_table *ctl, int write,

			    void __user * buffer, size_t * lenp, loff_t * ppos)

{

	int ret;
@@ -1004,7 +1004,7 @@ int brnf_sysctl_call_tables(ctl_table * ctl, int write, 
	return ret;

}



static ctl_table brnf_table[] = {

static struct ctl_table brnf_table[] = {

	{

		.procname	= "bridge-nf-call-arptables",

		.data		= &brnf_call_arptables,

net/core/neighbour.c

+3 −3
Original line number Diff line number Diff line
@@ -2765,11 +2765,11 @@ EXPORT_SYMBOL(neigh_app_ns); 
static int zero;

static int unres_qlen_max = INT_MAX / SKB_TRUESIZE(ETH_FRAME_LEN);



static int proc_unres_qlen(ctl_table *ctl, int write, void __user *buffer,

			   size_t *lenp, loff_t *ppos)

static int proc_unres_qlen(struct ctl_table *ctl, int write,

			   void __user *buffer, size_t *lenp, loff_t *ppos)

{

	int size, ret;

	ctl_table tmp = *ctl;

	struct ctl_table tmp = *ctl;



	tmp.extra1 = &zero;

	tmp.extra2 = &unres_qlen_max;

net/core/sysctl_net_core.c

+4 −4
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 
static int one = 1;



#ifdef CONFIG_RPS

static int rps_sock_flow_sysctl(ctl_table *table, int write,

static int rps_sock_flow_sysctl(struct ctl_table *table, int write,

				void __user *buffer, size_t *lenp, loff_t *ppos)

{

	unsigned int orig_size, size;

	int ret, i;

	ctl_table tmp = {

	struct ctl_table tmp = {

		.data = &size,

		.maxlen = sizeof(size),

		.mode = table->mode
@@ -91,7 +91,7 @@ static int rps_sock_flow_sysctl(ctl_table *table, int write, 
#ifdef CONFIG_NET_FLOW_LIMIT

static DEFINE_MUTEX(flow_limit_update_mutex);



static int flow_limit_cpu_sysctl(ctl_table *table, int write,

static int flow_limit_cpu_sysctl(struct ctl_table *table, int write,

				 void __user *buffer, size_t *lenp,

				 loff_t *ppos)

{
@@ -156,7 +156,7 @@ static int flow_limit_cpu_sysctl(ctl_table *table, int write, 
	return ret;

}



static int flow_limit_table_len_sysctl(ctl_table *table, int write,

static int flow_limit_table_len_sysctl(struct ctl_table *table, int write,

				       void __user *buffer, size_t *lenp,

				       loff_t *ppos)

{

net/decnet/dn_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -158,11 +158,11 @@ static int max_t3[] = { 8191 }; /* Must fit in 16 bits when multiplied by BCT3MU 
static int min_priority[1];

static int max_priority[] = { 127 }; /* From DECnet spec */



static int dn_forwarding_proc(ctl_table *, int,

static int dn_forwarding_proc(struct ctl_table *, int,

			void __user *, size_t *, loff_t *);

static struct dn_dev_sysctl_table {

	struct ctl_table_header *sysctl_header;

	ctl_table dn_dev_vars[5];

	struct ctl_table dn_dev_vars[5];

} dn_dev_sysctl = {

	NULL,

	{
@@ -242,7 +242,7 @@ static void dn_dev_sysctl_unregister(struct dn_dev_parms *parms) 
	}

}



static int dn_forwarding_proc(ctl_table *table, int write,

static int dn_forwarding_proc(struct ctl_table *table, int write,

				void __user *buffer,

				size_t *lenp, loff_t *ppos)

{