Revert "Move xen patchset to new version's subdir."

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / SoN-04-net-ipv6-route-cleanup-sysctl.patch

diff --git a/src/patches/suse-2.6.27.31/patches.suse/SoN-04-net-ipv6-route-cleanup-sysctl.patch b/src/patches/suse-2.6.27.31/patches.suse/SoN-04-net-ipv6-route-cleanup-sysctl.patch
deleted file mode 100644 (file)
index 1cbb212..0000000
--- a/src/patches/suse-2.6.27.31/patches.suse/SoN-04-net-ipv6-route-cleanup-sysctl.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Peter Zijlstra <a.p.zijlstra@chello.nl> 
-Subject: net: ipv6: initialize ip6_route sysctl vars in ip6_route_net_init()
-Patch-mainline: No
-References: FATE#303834
-
-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>
-Acked-by: Neil Brown <neilb@suse.de>
-Acked-by: Suresh Jayaraman <sjayaraman@suse.de>
-
----
- net/ipv6/af_inet6.c |    8 --------
- net/ipv6/route.c    |    9 +++++++++
- 2 files changed, 9 insertions(+), 8 deletions(-)
-
-Index: linux-2.6.26/net/ipv6/af_inet6.c
-===================================================================
---- linux-2.6.26.orig/net/ipv6/af_inet6.c
-+++ linux-2.6.26/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.26/net/ipv6/route.c
-===================================================================
---- linux-2.6.26.orig/net/ipv6/route.c
-+++ linux-2.6.26/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);