Home » Mailing list archives » linux-kernel » 2008 » October » 2

[PATCH 04/32] net: ipv6: initialize ip6_route sysctl vars in ip6_route_net_init()

Previous thread: [PATCH 19/32] netvm: network reserve infrastructure by Peter Zijlstra on Thursday, October 2, 2008 - 6:05 am. (1 message)

Next thread: [PATCH 16/32] net: wrap sk->sk_backlog_rcv() by Peter Zijlstra on Thursday, October 2, 2008 - 6:05 am. (2 messages)
[view original message]
From: Peter Zijlstra
Subject: [PATCH 04/32] net: ipv6: initialize ip6_route sysctl vars in ip6_route_net_init()
Date: Thursday, October 2, 2008 - 6:05 am

This makes that ip6_route_net_init() does all of the route init code.
There used to be a race between ip6_route_net_init() and ip6_net_init()
and someone relying on the combined result was left out cold.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
 net/ipv6/af_inet6.c |    8 --------
 net/ipv6/route.c    |    9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

Index: linux-2.6/net/ipv6/af_inet6.c
===================================================================
--- linux-2.6.orig/net/ipv6/af_inet6.c
+++ linux-2.6/net/ipv6/af_inet6.c
@@ -839,14 +839,6 @@ static int inet6_net_init(struct net *ne
 	int err = 0;
 
 	net->ipv6.sysctl.bindv6only = 0;
-	net->ipv6.sysctl.flush_delay = 0;
-	net->ipv6.sysctl.ip6_rt_max_size = 4096;
-	net->ipv6.sysctl.ip6_rt_gc_min_interval = HZ / 2;
-	net->ipv6.sysctl.ip6_rt_gc_timeout = 60*HZ;
-	net->ipv6.sysctl.ip6_rt_gc_interval = 30*HZ;
-	net->ipv6.sysctl.ip6_rt_gc_elasticity = 9;
-	net->ipv6.sysctl.ip6_rt_mtu_expires = 10*60*HZ;
-	net->ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40;
 	net->ipv6.sysctl.icmpv6_time = 1*HZ;
 
 #ifdef CONFIG_PROC_FS
Index: linux-2.6/net/ipv6/route.c
===================================================================
--- linux-2.6.orig/net/ipv6/route.c
+++ linux-2.6/net/ipv6/route.c
@@ -2627,6 +2627,15 @@ static int ip6_route_net_init(struct net
 	net->ipv6.ip6_blk_hole_entry->u.dst.ops = net->ipv6.ip6_dst_ops;
 #endif
 
+	net->ipv6.sysctl.flush_delay = 0;
+	net->ipv6.sysctl.ip6_rt_max_size = 4096;
+	net->ipv6.sysctl.ip6_rt_gc_min_interval = HZ / 2;
+	net->ipv6.sysctl.ip6_rt_gc_timeout = 60*HZ;
+	net->ipv6.sysctl.ip6_rt_gc_interval = 30*HZ;
+	net->ipv6.sysctl.ip6_rt_gc_elasticity = 9;
+	net->ipv6.sysctl.ip6_rt_mtu_expires = 10*60*HZ;
+	net->ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40;
+
 #ifdef CONFIG_PROC_FS
 	proc_net_fops_create(net, "ipv6_route", 0, &ipv6_route_proc_fops);
 	proc_net_fops_create(net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);

-- ...
[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 04/32] net: ipv6: initialize ip6_route sysctl vars in ip6_route_net_init()
Date: Tuesday, October 7, 2008 - 2:15 pm

From: Peter Zijlstra <a.p.zijlstra@chello.nl>

Looks good, applied to net-next-2.6, thanks.
--


[ message continues ]
Previous thread: [PATCH 19/32] netvm: network reserve infrastructure by Peter Zijlstra on Thursday, October 2, 2008 - 6:05 am. (1 message)

Next thread: [PATCH 16/32] net: wrap sk->sk_backlog_rcv() by Peter Zijlstra on Thursday, October 2, 2008 - 6:05 am. (2 messages)