diff options
| author | Waldemar Brodkorb <wbx@openwrt.org> | 2005-12-25 04:08:13 +0000 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openwrt.org> | 2005-12-25 04:08:13 +0000 |
| commit | 0e0b0d71bf13dbfee2d254749b6aa0fa94bc80f9 (patch) | |
| tree | 3d6396d5569ac9e9d5ddc2003b6df2c000f8e872 /target | |
| parent | 1fabbf6f5bb8571ea1cb3520cc42ecaa2731067e (diff) | |
| download | upstream-0e0b0d71bf13dbfee2d254749b6aa0fa94bc80f9.tar.gz upstream-0e0b0d71bf13dbfee2d254749b6aa0fa94bc80f9.tar.bz2 upstream-0e0b0d71bf13dbfee2d254749b6aa0fa94bc80f9.zip | |
fix oops on start, forgot to ifdef one call last time, closes #133
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2769 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/package/openswan/patches/fix-compile-pfkey.patch | 13 | ||||
| -rw-r--r-- | target/linux/package/openswan/patches/fix-oops-on-24.patch | 23 |
2 files changed, 23 insertions, 13 deletions
diff --git a/target/linux/package/openswan/patches/fix-compile-pfkey.patch b/target/linux/package/openswan/patches/fix-compile-pfkey.patch deleted file mode 100644 index 0a0ece36ed..0000000000 --- a/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/target/linux/package/openswan/patches/fix-oops-on-24.patch b/target/linux/package/openswan/patches/fix-oops-on-24.patch new file mode 100644 index 0000000000..0861b0489e --- /dev/null +++ b/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; + } |