From 88e632d853ac18fc82ef245486ed952ef124739c Mon Sep 17 00:00:00 2001 From: Andy Boyett Date: Fri, 15 May 2009 10:36:04 +0000 Subject: generic-2.4: refresh patches SVN-Revision: 15860 --- .../generic-2.4/patches/109-ipsec_nat_traversal.patch | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch') diff --git a/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch b/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch index 757df15e21..51981b8afc 100644 --- a/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch +++ b/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch @@ -1,8 +1,6 @@ packaging/utils/nattpatch 2.4 -Index: linux-2.4.35.4/include/net/sock.h -=================================================================== ---- linux-2.4.35.4.orig/include/net/sock.h -+++ linux-2.4.35.4/include/net/sock.h +--- a/include/net/sock.h ++++ b/include/net/sock.h @@ -488,7 +488,13 @@ struct tcp_opt { } bictcp; }; @@ -28,10 +26,8 @@ Index: linux-2.4.35.4/include/net/sock.h } tp_pinfo; -Index: linux-2.4.35.4/net/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/Config.in -+++ linux-2.4.35.4/net/Config.in +--- a/net/Config.in ++++ b/net/Config.in @@ -104,4 +104,6 @@ comment 'Network testing' dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS endmenu @@ -39,10 +35,8 @@ Index: linux-2.4.35.4/net/Config.in +bool 'IPSEC NAT-Traversal' CONFIG_IPSEC_NAT_TRAVERSAL + endmenu -Index: linux-2.4.35.4/net/ipv4/udp.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/udp.c -+++ linux-2.4.35.4/net/ipv4/udp.c +--- a/net/ipv4/udp.c ++++ b/net/ipv4/udp.c @@ -860,6 +860,9 @@ static void udp_close(struct sock *sk, l static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) -- cgit v1.2.3