Commit 9e103fa6 authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

[IPVS]: Fix sysctl warnings about missing strategy in schedulers 



sysctl table check failed: /net/ipv4/vs/lblc_expiration .3.5.21.19 Missing strategy
[...]
sysctl table check failed: /net/ipv4/vs/lblcr_expiration .3.5.21.20 Missing strategy

Switch these entried over to use CTL_UNNUMBERED as clearly
the sys_syscal portion wasn't working.

This is along the same lines as Christian Borntraeger's patch that fixes
up entries with no stratergy in net/ipv4/ipvs/ip_vs_ctl.c

Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 611cd55b

include/net/ip_vs.h

+0 −2
Original line number Diff line number Diff line
@@ -348,8 +348,6 @@ enum { 
	NET_IPV4_VS_TO_SA=16,

	NET_IPV4_VS_TO_UDP=17,

	NET_IPV4_VS_TO_ICMP=18,

	NET_IPV4_VS_LBLC_EXPIRE=19,

	NET_IPV4_VS_LBLCR_EXPIRE=20,

	NET_IPV4_VS_CACHE_BYPASS=22,

	NET_IPV4_VS_EXPIRE_NODEST_CONN=23,

	NET_IPV4_VS_NAT_ICMP_SEND=25,

kernel/sysctl_check.c

+0 −2
Original line number Diff line number Diff line
@@ -258,8 +258,6 @@ static struct trans_ctl_table trans_net_ipv4_vs_table[] = { 
	{ NET_IPV4_VS_EXPIRE_NODEST_CONN,	"expire_nodest_conn" },

	{ NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE,	"expire_quiescent_template" },

	{ NET_IPV4_VS_NAT_ICMP_SEND,	"nat_icmp_send" },

	{ NET_IPV4_VS_LBLC_EXPIRE,		"lblc_expiration" },

	{ NET_IPV4_VS_LBLCR_EXPIRE,		"lblcr_expiration" },

	{}

};

net/ipv4/ipvs/ip_vs_lblc.c

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ struct ip_vs_lblc_table { 


static ctl_table vs_vars_table[] = {

	{

		.ctl_name	= NET_IPV4_VS_LBLC_EXPIRE,

		.procname	= "lblc_expiration",

		.data		= &sysctl_ip_vs_lblc_expiration,

		.maxlen		= sizeof(int),

net/ipv4/ipvs/ip_vs_lblcr.c

+0 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ struct ip_vs_lblcr_table { 


static ctl_table vs_vars_table[] = {

	{

		.ctl_name	= NET_IPV4_VS_LBLCR_EXPIRE,

		.procname	= "lblcr_expiration",

		.data		= &sysctl_ip_vs_lblcr_expiration,

		.maxlen		= sizeof(int),