aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-02-08 19:11:53 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-02-08 19:11:53 +0000
commit5d67fbe1b7c3aa6e64c9c694aef1e0769072e973 (patch)
treeec1c8bf5e7f64f9f25f42356462dd8d23dc141f5 /target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch
parent2b2541ebad985e416bd9a95e4fb8ccad1407570b (diff)
downloadupstream-5d67fbe1b7c3aa6e64c9c694aef1e0769072e973.tar.gz
upstream-5d67fbe1b7c3aa6e64c9c694aef1e0769072e973.tar.bz2
upstream-5d67fbe1b7c3aa6e64c9c694aef1e0769072e973.zip
generic-2.6/2.6.23: refresh patches
SVN-Revision: 14448
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch b/target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch
index 71b7377027..f29b351bdd 100644
--- a/target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch
@@ -13,7 +13,7 @@
+extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
-@@ -224,6 +224,12 @@
+@@ -224,6 +224,12 @@ config NET_IPGRE_BROADCAST
Network), but can be distributed all over the Internet. If you want
to do that, say Y here and to "IP multicast routing" below.
@@ -36,7 +36,7 @@
static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
{
-@@ -161,6 +162,29 @@
+@@ -161,6 +162,29 @@ drop:
return 0;
}
@@ -66,7 +66,7 @@
/* If it's a keepalive packet, then just eat it.
* If it's an encapsulated packet, then pass it to the
* IPsec xfrm input.
-@@ -251,7 +275,13 @@
+@@ -251,7 +275,13 @@ int xfrm4_udp_encap_rcv(struct sock *sk,
iph->protocol = IPPROTO_ESP;
/* process ESP */
@@ -80,7 +80,7 @@
return ret;
drop:
-@@ -265,3 +295,8 @@
+@@ -265,3 +295,8 @@ int xfrm4_rcv(struct sk_buff *skb)
}
EXPORT_SYMBOL(xfrm4_rcv);