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

ipv4: convert ip_forward_update_priority sysctl to u8 



This sysctl uses ip_fwd_update_priority() helper,
so the conversion needs to change it.

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

include/net/netns/ipv4.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct netns_ipv4 { 
	u8 sysctl_ip_default_ttl;

	u8 sysctl_ip_no_pmtu_disc;

	u8 sysctl_ip_fwd_use_pmtu;

	int sysctl_ip_fwd_update_priority;

	u8 sysctl_ip_fwd_update_priority;

	u8 sysctl_ip_nonlocal_bind;

	u8 sysctl_ip_autobind_reuse;

	/* Shall we try to damage output packets if routing dev changes? */

net/ipv4/sysctl_net_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int ipv4_fwd_update_priority(struct ctl_table *table, int write, 


	net = container_of(table->data, struct net,

			   ipv4.sysctl_ip_fwd_update_priority);

	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_FWD_UPDATE_PRIORITY_UPDATE,

					net);
@@ -743,7 +743,7 @@ static struct ctl_table ipv4_net_table[] = { 
	{

		.procname	= "ip_forward_update_priority",

		.data		= &init_net.ipv4.sysctl_ip_fwd_update_priority,

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(u8),

		.mode		= 0644,

		.proc_handler   = ipv4_fwd_update_priority,

		.extra1		= SYSCTL_ZERO,