summaryrefslogtreecommitdiff
path: root/openwrt
diff options
context:
space:
mode:
authorwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-25 04:08:13 +0000
committerwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-25 04:08:13 +0000
commit5a158e99a00d2325ed30454ae941ff439052d38e (patch)
treef310475c0c4bacf2539d3c6d1c509ef5af4840d0 /openwrt
parent9d6b9d7ca7e153dfcf1366e1815293512162cb05 (diff)
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
Diffstat (limited to 'openwrt')
-rw-r--r--openwrt/target/linux/package/openswan/patches/fix-compile-pfkey.patch13
-rw-r--r--openwrt/target/linux/package/openswan/patches/fix-oops-on-24.patch23
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 0a0ece36ed..0000000000
--- 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 0000000000..0861b0489e
--- /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;
+ }