aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Albon <malbon@openwrt.org>2007-01-03 13:32:32 +0000
committerMike Albon <malbon@openwrt.org>2007-01-03 13:32:32 +0000
commit80c5a55e3eedb9607fab22f850b32d0c75941b6f (patch)
tree29b414eca09ecca3fac193aa764e480c740af8bc
parente0f251d25fd47ebf8849365a82f44f0bcca1164b (diff)
downloadupstream-80c5a55e3eedb9607fab22f850b32d0c75941b6f.tar.gz
upstream-80c5a55e3eedb9607fab22f850b32d0c75941b6f.tar.bz2
upstream-80c5a55e3eedb9607fab22f850b32d0c75941b6f.zip
Fix pfkey compile problem on 2.4 kernels.
SVN-Revision: 5972
-rw-r--r--package/openswan/patches/200-linux_pfkey_2.4.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/package/openswan/patches/200-linux_pfkey_2.4.patch b/package/openswan/patches/200-linux_pfkey_2.4.patch
new file mode 100644
index 0000000000..15f9fa7245
--- /dev/null
+++ b/package/openswan/patches/200-linux_pfkey_2.4.patch
@@ -0,0 +1,33 @@
+diff -urN openswan-2.4.7.old/linux/net/ipsec/pfkey_v2.c openswan-2.4.7/linux/net/ipsec/pfkey_v2.c
+--- openswan-2.4.7.old/linux/net/ipsec/pfkey_v2.c 2007-01-03 11:11:04.645909731 +0000
++++ openswan-2.4.7/linux/net/ipsec/pfkey_v2.c 2007-01-03 11:14:54.482143945 +0000
+@@ -119,7 +119,9 @@
+ #ifdef NETDEV_23
+ .family = PF_KEY,
+ .create = pfkey_create,
++#ifdef NET_26
+ .owner = THIS_MODULE,
++#endif
+ #else
+ PF_KEY,
+ pfkey_create
+@@ -129,7 +131,9 @@
+ struct proto_ops SOCKOPS_WRAPPED(pfkey_ops) = {
+ #ifdef NETDEV_23
+ family: PF_KEY,
++#ifdef NET_26
+ owner: THIS_MODULE,
++#endif
+ release: pfkey_release,
+ bind: sock_no_bind,
+ connect: sock_no_connect,
+@@ -1559,6 +1563,9 @@
+
+ /*
+ * $Log: pfkey_v2.c,v $
++ * Revision 1.97.2.11 2006/11/15 16:05:57 paul
++ * fix for compiling on 2.4. kernels by Matthias Haas.
++ *
+ * Revision 1.97.2.10 2006/10/10 20:43:28 paul
+ * Add family/create/owner for pfkey_family_ops. This fixes bug #671
+ *