diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2009-02-08 19:33:57 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2009-02-08 19:33:57 +0000 |
commit | 3bb939ab30234ed985817d438e0e01b8b126b3d1 (patch) | |
tree | f3fc6001f5b20a75470276c236e0b595d3e9744e /target/linux/generic-2.6/patches-2.6.21/120-openswan-2.4.0.kernel-2.6-natt.patch | |
parent | 39a9e851a7ef08af339421d4978a09150772f9ec (diff) | |
download | master-187ad058-3bb939ab30234ed985817d438e0e01b8b126b3d1.tar.gz master-187ad058-3bb939ab30234ed985817d438e0e01b8b126b3d1.tar.bz2 master-187ad058-3bb939ab30234ed985817d438e0e01b8b126b3d1.zip |
[kernel] generic-2.6/2.6.21: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14453 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.21/120-openswan-2.4.0.kernel-2.6-natt.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.21/120-openswan-2.4.0.kernel-2.6-natt.patch | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.21/120-openswan-2.4.0.kernel-2.6-natt.patch b/target/linux/generic-2.6/patches-2.6.21/120-openswan-2.4.0.kernel-2.6-natt.patch index 6df04a5a41..73d87c2f8e 100644 --- a/target/linux/generic-2.6/patches-2.6.21/120-openswan-2.4.0.kernel-2.6-natt.patch +++ b/target/linux/generic-2.6/patches-2.6.21/120-openswan-2.4.0.kernel-2.6-natt.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.21.7/include/net/xfrmudp.h -=================================================================== --- /dev/null -+++ linux-2.6.21.7/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,10 +11,8 @@ Index: linux-2.6.21.7/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.21.7/net/ipv4/Kconfig -=================================================================== ---- linux-2.6.21.7.orig/net/ipv4/Kconfig -+++ linux-2.6.21.7/net/ipv4/Kconfig +--- a/net/ipv4/Kconfig ++++ b/net/ipv4/Kconfig @@ -266,6 +266,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. @@ -30,10 +26,8 @@ Index: linux-2.6.21.7/net/ipv4/Kconfig config IP_MROUTE bool "IP: multicast routing" depends on IP_MULTICAST -Index: linux-2.6.21.7/net/ipv4/udp.c -=================================================================== ---- linux-2.6.21.7.orig/net/ipv4/udp.c -+++ linux-2.6.21.7/net/ipv4/udp.c +--- a/net/ipv4/udp.c ++++ b/net/ipv4/udp.c @@ -101,12 +101,15 @@ #include <net/route.h> #include <net/checksum.h> |