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:
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.patch24
1 files changed, 9 insertions, 15 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 879073333f..71b7377027 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
@@ -1,7 +1,5 @@
-Index: linux-2.6.23.17/include/net/xfrmudp.h
-===================================================================
--- /dev/null
-+++ linux-2.6.23.17/include/net/xfrmudp.h
++++ b/include/net/xfrmudp.h
@@ -0,0 +1,10 @@
+/*
+ * pointer to function for type that xfrm4_input wants, to permit
@@ -13,11 +11,9 @@ Index: linux-2.6.23.17/include/net/xfrmudp.h
+extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
+ , xfrm4_rcv_encap_t *oldfunc);
+extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
-Index: linux-2.6.23.17/net/ipv4/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/net/ipv4/Kconfig
-+++ linux-2.6.23.17/net/ipv4/Kconfig
-@@ -224,6 +224,12 @@ config NET_IPGRE_BROADCAST
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -224,6 +224,12 @@
Network), but can be distributed all over the Internet. If you want
to do that, say Y here and to "IP multicast routing" below.
@@ -30,10 +26,8 @@ Index: linux-2.6.23.17/net/ipv4/Kconfig
config IP_MROUTE
bool "IP: multicast routing"
depends on IP_MULTICAST
-Index: linux-2.6.23.17/net/ipv4/xfrm4_input.c
-===================================================================
---- linux-2.6.23.17.orig/net/ipv4/xfrm4_input.c
-+++ linux-2.6.23.17/net/ipv4/xfrm4_input.c
+--- a/net/ipv4/xfrm4_input.c
++++ b/net/ipv4/xfrm4_input.c
@@ -15,6 +15,7 @@
#include <linux/netfilter_ipv4.h>
#include <net/ip.h>
@@ -42,7 +36,7 @@ Index: linux-2.6.23.17/net/ipv4/xfrm4_input.c
static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
{
-@@ -161,6 +162,29 @@ drop:
+@@ -161,6 +162,29 @@
return 0;
}
@@ -72,7 +66,7 @@ Index: linux-2.6.23.17/net/ipv4/xfrm4_input.c
/* 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 @@ int xfrm4_udp_encap_rcv(struct sock *sk,
+@@ -251,7 +275,13 @@
iph->protocol = IPPROTO_ESP;
/* process ESP */
@@ -86,7 +80,7 @@ Index: linux-2.6.23.17/net/ipv4/xfrm4_input.c
return ret;
drop:
-@@ -265,3 +295,8 @@ int xfrm4_rcv(struct sk_buff *skb)
+@@ -265,3 +295,8 @@
}
EXPORT_SYMBOL(xfrm4_rcv);