rpms/kernel/F-11 linux-2.6-xfrm-export-gc_thresh.patch, NONE, 1.1 kernel.spec, 1.1682, 1.1683

[Neil Horman]

Author: nhorman

Update of /cvs/extras/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20071

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-xfrm-export-gc_thresh.patch 
Log Message:
Resolves: bz503124

linux-2.6-xfrm-export-gc_thresh.patch:
 ipv4/xfrm4_policy.c |   18 ++++++++++++++++++
 ipv6/xfrm6_policy.c |   18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

--- NEW FILE linux-2.6-xfrm-export-gc_thresh.patch ---
diff -up linux-2.6.30.noarch/net/ipv4/xfrm4_policy.c.orig linux-2.6.30.noarch/net/ipv4/xfrm4_policy.c
--- linux-2.6.30.noarch/net/ipv4/xfrm4_policy.c.orig	2009-06-09 23:05:27.000000000 -0400
+++ linux-2.6.30.noarch/net/ipv4/xfrm4_policy.c	2009-07-27 19:16:16.000000000 -0400
@@ -263,6 +263,20 @@ static struct xfrm_policy_afinfo xfrm4_p
 	.fill_dst =		xfrm4_fill_dst,
 };
 
+static struct ctl_table xfrm4_policy_table[] = {
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "xfrm4_gc_thresh",
+                .data           = &xfrm4_dst_ops.gc_thresh,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec,
+        },
+        { }
+};
+
+static struct ctl_table_header *sysctl_hdr;
+
 static void __init xfrm4_policy_init(void)
 {
 	xfrm_policy_register_afinfo(&xfrm4_policy_afinfo);
@@ -270,6 +284,8 @@ static void __init xfrm4_policy_init(voi
 
 static void __exit xfrm4_policy_fini(void)
 {
+	if (sysctl_hdr)
+		unregister_net_sysctl_table(sysctl_hdr);
 	xfrm_policy_unregister_afinfo(&xfrm4_policy_afinfo);
 }
 
@@ -277,5 +293,7 @@ void __init xfrm4_init(void)
 {
 	xfrm4_state_init();
 	xfrm4_policy_init();
+	sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv4_ctl_path,
+						xfrm4_policy_table);
 }
 
diff -up linux-2.6.30.noarch/net/ipv6/xfrm6_policy.c.orig linux-2.6.30.noarch/net/ipv6/xfrm6_policy.c
--- linux-2.6.30.noarch/net/ipv6/xfrm6_policy.c.orig	2009-06-09 23:05:27.000000000 -0400
+++ linux-2.6.30.noarch/net/ipv6/xfrm6_policy.c	2009-07-27 19:16:16.000000000 -0400
@@ -304,6 +304,20 @@ static void xfrm6_policy_fini(void)
 	xfrm_policy_unregister_afinfo(&xfrm6_policy_afinfo);
 }
 
+static struct ctl_table xfrm6_policy_table[] = {
+	{
+		.ctl_name       = CTL_UNNUMBERED,
+		.procname       = "xfrm6_gc_thresh",
+		.data	   	= &xfrm6_dst_ops.gc_thresh,
+		.maxlen	 	= sizeof(int),
+		.mode	   	= 0644,
+		.proc_handler   = proc_dointvec,
+	},
+	{ }
+};
+
+static struct ctl_table_header *sysctl_hdr;
+
 int __init xfrm6_init(void)
 {
 	int ret;
@@ -315,6 +329,8 @@ int __init xfrm6_init(void)
 	ret = xfrm6_state_init();
 	if (ret)
 		goto out_policy;
+	sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv6_ctl_path,
+						xfrm6_policy_table);
 out:
 	return ret;
 out_policy:
@@ -324,6 +340,8 @@ out_policy:
 
 void xfrm6_fini(void)
 {
+	if (sysctl_hdr)
+		unregister_net_sysctl_table(sysctl_hdr);
 	//xfrm6_input_fini();
 	xfrm6_policy_fini();
 	xfrm6_state_fini();


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1682
retrieving revision 1.1683
diff -u -p -r1.1682 -r1.1683
--- kernel.spec	25 Jul 2009 04:09:23 -0000	1.1682
+++ kernel.spec	27 Jul 2009 23:25:49 -0000	1.1683
@@ -684,6 +684,8 @@ Patch11060: via-padlock-50-nano-cbc.patc
 Patch11070: via-rng-enable-64bit.patch
 Patch11080: via-sdmmc.patch
 
+# Commit a44a4a006b860476881ec0098c36584036e1cb91 fron net-next-2.6.git
+Patch12000: linux-2.6-xfrm-export-gc_thresh.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1105,6 +1107,9 @@ ApplyPatch via-padlock-50-nano-cbc.patch
 ApplyPatch via-rng-enable-64bit.patch
 ApplyPatch via-sdmmc.patch
 
+# Export xfrm[4|6] gc_thresh values to sysctl
+ApplyPatch linux-2.6-xfrm-export-gc_thresh.patch
+
 #
 # PowerPC
 #
@@ -1830,6 +1835,9 @@ fi
 # and build.
 
 %changelog
+* Mon Jul 27 2009 Neil Horman <nhorman at redhat.com>
+- Backport xfrm gc_thresh export code (bz 503124)
+
 * Fri Jul 24 2009 Kyle McMartin <kyle at redhat.com>
 - CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 [i386 x86_64], 4096 elsewhere, as
   per defconfigs.