sync with trunk

SVN-Revision: 2770

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 (file)
index 0000000..0861b04
--- /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;
+ }