Commit 349d2895 authored by Vasily Averin's avatar Vasily Averin Committed by David S. Miller
Browse files

ipv4: NET_IPV4_ROUTE_GC_INTERVAL removal 



removing obsoleted sysctl,
ip_rt_gc_interval variable no longer used since 2.6.38

Signed-off-by: default avatarVasily Averin <vvs@sw.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a355d865

include/linux/sysctl.h

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ enum { 
	NET_IPV4_ROUTE_MAX_SIZE=5,

	NET_IPV4_ROUTE_GC_MIN_INTERVAL=6,

	NET_IPV4_ROUTE_GC_TIMEOUT=7,

	NET_IPV4_ROUTE_GC_INTERVAL=8,

	NET_IPV4_ROUTE_GC_INTERVAL=8, /* obsolete since 2.6.38 */

	NET_IPV4_ROUTE_REDIRECT_LOAD=9,

	NET_IPV4_ROUTE_REDIRECT_NUMBER=10,

	NET_IPV4_ROUTE_REDIRECT_SILENCE=11,

kernel/sysctl_binary.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static const struct bin_table bin_net_ipv4_route_table[] = { 
	{ CTL_INT,	NET_IPV4_ROUTE_GC_MIN_INTERVAL,		"gc_min_interval" },

	{ CTL_INT,	NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS,	"gc_min_interval_ms" },

	{ CTL_INT,	NET_IPV4_ROUTE_GC_TIMEOUT,		"gc_timeout" },

	{ CTL_INT,	NET_IPV4_ROUTE_GC_INTERVAL,		"gc_interval" },

	/* NET_IPV4_ROUTE_GC_INTERVAL "gc_interval" no longer used */

	{ CTL_INT,	NET_IPV4_ROUTE_REDIRECT_LOAD,		"redirect_load" },

	{ CTL_INT,	NET_IPV4_ROUTE_REDIRECT_NUMBER,		"redirect_number" },

	{ CTL_INT,	NET_IPV4_ROUTE_REDIRECT_SILENCE,	"redirect_silence" },

net/ipv4/route.c

+0 −8
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ 


static int ip_rt_max_size;

static int ip_rt_gc_timeout __read_mostly	= RT_GC_TIMEOUT;

static int ip_rt_gc_interval __read_mostly	= 60 * HZ;

static int ip_rt_gc_min_interval __read_mostly	= HZ / 2;

static int ip_rt_redirect_number __read_mostly	= 9;

static int ip_rt_redirect_load __read_mostly	= HZ / 50;
@@ -3120,13 +3119,6 @@ static ctl_table ipv4_route_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

	},

	{

		.procname	= "gc_interval",

		.data		= &ip_rt_gc_interval,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

	},

	{

		.procname	= "redirect_load",

		.data		= &ip_rt_redirect_load,