Commit be205fe6 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv4: convert fib_multipath_{use_neigh|hash_policy} sysctls to u8 



Make room for better packing of netns_ipv4

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd04bd02

include/net/netns/ipv4.h

+2 −2
Original line number Diff line number Diff line
@@ -220,8 +220,8 @@ struct netns_ipv4 { 
#endif

#endif

#ifdef CONFIG_IP_ROUTE_MULTIPATH

	int sysctl_fib_multipath_use_neigh;

	int sysctl_fib_multipath_hash_policy;

	u8 sysctl_fib_multipath_use_neigh;

	u8 sysctl_fib_multipath_hash_policy;

#endif



	struct fib_notifier_ops	*notifier_ops;

net/ipv4/sysctl_net_ipv4.c

+4 −4
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static int proc_fib_multipath_hash_policy(struct ctl_table *table, int write, 
	    ipv4.sysctl_fib_multipath_hash_policy);

	int ret;



	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);

	ret = proc_dou8vec_minmax(table, write, buffer, lenp, ppos);

	if (write && ret == 0)

		call_netevent_notifiers(NETEVENT_IPV4_MPATH_HASH_UPDATE, net);
@@ -1038,16 +1038,16 @@ static struct ctl_table ipv4_net_table[] = { 
	{

		.procname	= "fib_multipath_use_neigh",

		.data		= &init_net.ipv4.sysctl_fib_multipath_use_neigh,

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(u8),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.proc_handler	= proc_dou8vec_minmax,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

	{

		.procname	= "fib_multipath_hash_policy",

		.data		= &init_net.ipv4.sysctl_fib_multipath_hash_policy,

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(u8),

		.mode		= 0644,

		.proc_handler	= proc_fib_multipath_hash_policy,

		.extra1		= SYSCTL_ZERO,