fix oops on start, forgot to ifdef one call last time, closes #133

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2769 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 23 insertions, 13 deletions

diff --git a/openwrt/target/linux/package/openswan/patches/fix-compile-pfkey.patch b/openwrt/target/linux/package/openswan/patches/fix-compile-pfkey.patch
deleted file mode 100644
index 0a0ece36e..000000000
--- a/openwrt/target/linux/package/openswan/patches/fix-compile-pfkey.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur openswan-2.4.0.orig/linux/net/ipsec/pfkey_v2.c openswan-2.4.0/linux/net/ipsec/pfkey_v2.c
---- openswan-2.4.0.orig/linux/net/ipsec/pfkey_v2.c	2005-09-06 04:10:03.000000000 +0200
-+++ openswan-2.4.0/linux/net/ipsec/pfkey_v2.c	2005-09-21 09:32:49.214628750 +0200
-@@ -821,7 +821,9 @@
- 		return 0; /* -EINVAL; */
- 	}
- 
-+#ifdef NET_26
- 	write_lock_bh(&pfkey_sock_lock);
-+#endif
- 
- 	KLIPS_PRINT(debug_pfkey,
- 		    "klips_debug:pfkey_release: "
diff --git a/openwrt/target/linux/package/openswan/patches/fix-oops-on-24.patch b/openwrt/target/linux/package/openswan/patches/fix-oops-on-24.patch
new file mode 100644
index 000000000..0861b0489
--- /dev/null
+++ b/openwrt/target/linux/package/openswan/patches/fix-oops-on-24.patch
@@ -0,0 +1,23 @@
+diff -Nur openswan-2.4.4/linux/net/ipsec/pfkey_v2.c openswan-2.4.4.patched/linux/net/ipsec/pfkey_v2.c
+--- openswan-2.4.4/linux/net/ipsec/pfkey_v2.c	2005-09-14 18:40:45.000000000 +0200
++++ openswan-2.4.4.patched/linux/net/ipsec/pfkey_v2.c	2005-12-25 04:35:57.674968000 +0100
+@@ -820,7 +820,9 @@
+ 		return 0; /* -EINVAL; */
+ 	}
+ 
++#ifdef NET_26
+ 	write_lock_bh(&pfkey_sock_lock);
++#endif
+ 
+ 	KLIPS_PRINT(debug_pfkey,
+ 		    "klips_debug:pfkey_release: "
+@@ -851,7 +853,9 @@
+ 		    "klips_debug:pfkey_release: "
+ 		    "succeeded.\n");
+ 
++#ifdef NET_26
+ 	write_unlock_bh(&pfkey_sock_lock);
++#endif
+ 
+ 	return 0;
+ }