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

Commit 6d9f239a authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

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: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6cf3f41e

net/802/tr.c

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ static struct ctl_table tr_table[] = { 
		.data		= &sysctl_tr_rif_timeout,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec

		.proc_handler	= proc_dointvec

	},

	{ 0 },

};

net/appletalk/sysctl_net_atalk.c

+7 −7
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ static struct ctl_table atalk_table[] = { 
		.data		= &sysctl_aarp_expiry_time,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_jiffies,

		.strategy	= &sysctl_jiffies,

		.proc_handler	= proc_dointvec_jiffies,

		.strategy	= sysctl_jiffies,

	},

	{

		.ctl_name	= NET_ATALK_AARP_TICK_TIME,
@@ -26,8 +26,8 @@ static struct ctl_table atalk_table[] = { 
		.data		= &sysctl_aarp_tick_time,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_jiffies,

		.strategy	= &sysctl_jiffies,

		.proc_handler	= proc_dointvec_jiffies,

		.strategy	= sysctl_jiffies,

	},

	{

		.ctl_name	= NET_ATALK_AARP_RETRANSMIT_LIMIT,
@@ -35,7 +35,7 @@ static struct ctl_table atalk_table[] = { 
		.data		= &sysctl_aarp_retransmit_limit,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec,

		.proc_handler	= proc_dointvec,

	},

	{

		.ctl_name	= NET_ATALK_AARP_RESOLVE_TIME,
@@ -43,8 +43,8 @@ static struct ctl_table atalk_table[] = { 
		.data		= &sysctl_aarp_resolve_time,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_jiffies,

		.strategy	= &sysctl_jiffies,

		.proc_handler	= proc_dointvec_jiffies,

		.strategy	= sysctl_jiffies,

	},

	{ 0 },

};

net/ax25/sysctl_net_ax25.c

+28 −28
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "ip_default_mode",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_ipdefmode,

		.extra2		= &max_ipdefmode

	},
@@ -53,8 +53,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "ax25_default_mode",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_axdefmode,

		.extra2		= &max_axdefmode

	},
@@ -63,8 +63,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "backoff_type",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_backoff,

		.extra2		= &max_backoff

	},
@@ -73,8 +73,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "connect_mode",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_conmode,

		.extra2		= &max_conmode

	},
@@ -83,8 +83,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "standard_window_size",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_window,

		.extra2		= &max_window

	},
@@ -93,8 +93,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "extended_window_size",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_ewindow,

		.extra2		= &max_ewindow

	},
@@ -103,8 +103,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "t1_timeout",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_t1,

		.extra2		= &max_t1

	},
@@ -113,8 +113,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "t2_timeout",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_t2,

		.extra2		= &max_t2

	},
@@ -123,8 +123,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "t3_timeout",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_t3,

		.extra2		= &max_t3

	},
@@ -133,8 +133,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "idle_timeout",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_idle,

		.extra2		= &max_idle

	},
@@ -143,8 +143,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "maximum_retry_count",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_n2,

		.extra2		= &max_n2

	},
@@ -153,8 +153,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "maximum_packet_length",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_paclen,

		.extra2		= &max_paclen

	},
@@ -163,8 +163,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "protocol",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_proto,

		.extra2		= &max_proto

	},
@@ -174,8 +174,8 @@ static const ctl_table ax25_param_table[] = { 
		.procname	= "dama_slave_timeout",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.proc_handler	= proc_dointvec_minmax,

		.strategy	= sysctl_intvec,

		.extra1		= &min_ds_timeout,

		.extra2		= &max_ds_timeout

	},

net/bridge/br_netfilter.c

+5 −5
Original line number Diff line number Diff line
@@ -938,35 +938,35 @@ static ctl_table brnf_table[] = { 
		.data		= &brnf_call_arptables,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &brnf_sysctl_call_tables,

		.proc_handler	= brnf_sysctl_call_tables,

	},

	{

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

		.data		= &brnf_call_iptables,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &brnf_sysctl_call_tables,

		.proc_handler	= brnf_sysctl_call_tables,

	},

	{

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

		.data		= &brnf_call_ip6tables,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &brnf_sysctl_call_tables,

		.proc_handler	= brnf_sysctl_call_tables,

	},

	{

		.procname	= "bridge-nf-filter-vlan-tagged",

		.data		= &brnf_filter_vlan_tagged,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &brnf_sysctl_call_tables,

		.proc_handler	= brnf_sysctl_call_tables,

	},

	{

		.procname	= "bridge-nf-filter-pppoe-tagged",

		.data		= &brnf_filter_pppoe_tagged,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &brnf_sysctl_call_tables,

		.proc_handler	= brnf_sysctl_call_tables,

	},

	{ .ctl_name = 0 }

};

net/core/neighbour.c

+24 −24
Original line number Diff line number Diff line
@@ -2566,128 +2566,128 @@ static struct neigh_sysctl_table { 
			.procname	= "mcast_solicit",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec,

			.proc_handler	= proc_dointvec,

		},

		{

			.ctl_name	= NET_NEIGH_UCAST_SOLICIT,

			.procname	= "ucast_solicit",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec,

			.proc_handler	= proc_dointvec,

		},

		{

			.ctl_name	= NET_NEIGH_APP_SOLICIT,

			.procname	= "app_solicit",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec,

			.proc_handler	= proc_dointvec,

		},

		{

			.procname	= "retrans_time",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec_userhz_jiffies,

			.proc_handler	= proc_dointvec_userhz_jiffies,

		},

		{

			.ctl_name	= NET_NEIGH_REACHABLE_TIME,

			.procname	= "base_reachable_time",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec_jiffies,

			.strategy	= &sysctl_jiffies,

			.proc_handler	= proc_dointvec_jiffies,

			.strategy	= sysctl_jiffies,

		},

		{

			.ctl_name	= NET_NEIGH_DELAY_PROBE_TIME,

			.procname	= "delay_first_probe_time",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec_jiffies,

			.strategy	= &sysctl_jiffies,

			.proc_handler	= proc_dointvec_jiffies,

			.strategy	= sysctl_jiffies,

		},

		{

			.ctl_name	= NET_NEIGH_GC_STALE_TIME,

			.procname	= "gc_stale_time",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec_jiffies,

			.strategy	= &sysctl_jiffies,

			.proc_handler	= proc_dointvec_jiffies,

			.strategy	= sysctl_jiffies,

		},

		{

			.ctl_name	= NET_NEIGH_UNRES_QLEN,

			.procname	= "unres_qlen",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec,

			.proc_handler	= proc_dointvec,

		},

		{

			.ctl_name	= NET_NEIGH_PROXY_QLEN,

			.procname	= "proxy_qlen",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec,

			.proc_handler	= proc_dointvec,

		},

		{

			.procname	= "anycast_delay",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec_userhz_jiffies,

			.proc_handler	= proc_dointvec_userhz_jiffies,

		},

		{

			.procname	= "proxy_delay",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec_userhz_jiffies,

			.proc_handler	= proc_dointvec_userhz_jiffies,

		},

		{

			.procname	= "locktime",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec_userhz_jiffies,

			.proc_handler	= proc_dointvec_userhz_jiffies,

		},

		{

			.ctl_name	= NET_NEIGH_RETRANS_TIME_MS,

			.procname	= "retrans_time_ms",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec_ms_jiffies,

			.strategy	= &sysctl_ms_jiffies,

			.proc_handler	= proc_dointvec_ms_jiffies,

			.strategy	= sysctl_ms_jiffies,

		},

		{

			.ctl_name	= NET_NEIGH_REACHABLE_TIME_MS,

			.procname	= "base_reachable_time_ms",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec_ms_jiffies,

			.strategy	= &sysctl_ms_jiffies,

			.proc_handler	= proc_dointvec_ms_jiffies,

			.strategy	= sysctl_ms_jiffies,

		},

		{

			.ctl_name	= NET_NEIGH_GC_INTERVAL,

			.procname	= "gc_interval",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec_jiffies,

			.strategy	= &sysctl_jiffies,

			.proc_handler	= proc_dointvec_jiffies,

			.strategy	= sysctl_jiffies,

		},

		{

			.ctl_name	= NET_NEIGH_GC_THRESH1,

			.procname	= "gc_thresh1",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec,

			.proc_handler	= proc_dointvec,

		},

		{

			.ctl_name	= NET_NEIGH_GC_THRESH2,

			.procname	= "gc_thresh2",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec,

			.proc_handler	= proc_dointvec,

		},

		{

			.ctl_name	= NET_NEIGH_GC_THRESH3,

			.procname	= "gc_thresh3",

			.maxlen		= sizeof(int),

			.mode		= 0644,

			.proc_handler	= &proc_dointvec,

			.proc_handler	= proc_dointvec,

		},

		{},

	},