diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-19 13:44:11 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-19 13:44:11 +0000 |
commit | dfe741470a20d34fe482c94dae97ea99317dac4f (patch) | |
tree | 8ae84a0d3adf204fa7478c12d44ca550a0466472 /target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch | |
parent | 2e6536f7293cab817c990f2672a51d57fae203eb (diff) | |
download | master-31e0f0ae-dfe741470a20d34fe482c94dae97ea99317dac4f.tar.gz master-31e0f0ae-dfe741470a20d34fe482c94dae97ea99317dac4f.tar.bz2 master-31e0f0ae-dfe741470a20d34fe482c94dae97ea99317dac4f.zip |
refresh generic-2.4 patches
SVN-Revision: 11213
Diffstat (limited to 'target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch')
-rw-r--r-- | target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch | 24 |
1 files changed, 12 insertions, 12 deletions
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 7df8263471..757df15e21 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,9 +1,9 @@ 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 2007-12-15 05:19:41.462783867 +0100 -+++ linux-2.4.35.4/include/net/sock.h 2007-12-15 05:19:53.815487806 +0100 -@@ -488,7 +488,13 @@ +--- linux-2.4.35.4.orig/include/net/sock.h ++++ linux-2.4.35.4/include/net/sock.h +@@ -488,7 +488,13 @@ struct tcp_opt { } bictcp; }; @@ -18,7 +18,7 @@ Index: linux-2.4.35.4/include/net/sock.h /* * This structure really needs to be cleaned up. * Most of it is for TCP, and not used by any of -@@ -655,6 +661,9 @@ +@@ -655,6 +661,9 @@ struct sock { #if defined(CONFIG_SPX) || defined (CONFIG_SPX_MODULE) struct spx_opt af_spx; #endif /* CONFIG_SPX */ @@ -30,9 +30,9 @@ Index: linux-2.4.35.4/include/net/sock.h Index: linux-2.4.35.4/net/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/Config.in 2007-12-15 05:19:41.470784323 +0100 -+++ linux-2.4.35.4/net/Config.in 2007-12-15 05:19:53.819488035 +0100 -@@ -104,4 +104,6 @@ +--- linux-2.4.35.4.orig/net/Config.in ++++ linux-2.4.35.4/net/Config.in +@@ -104,4 +104,6 @@ comment 'Network testing' dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS endmenu @@ -41,9 +41,9 @@ Index: linux-2.4.35.4/net/Config.in endmenu Index: linux-2.4.35.4/net/ipv4/udp.c =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/udp.c 2007-12-15 05:19:41.482785007 +0100 -+++ linux-2.4.35.4/net/ipv4/udp.c 2007-12-15 05:19:53.823488264 +0100 -@@ -860,6 +860,9 @@ +--- linux-2.4.35.4.orig/net/ipv4/udp.c ++++ linux-2.4.35.4/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) { @@ -53,7 +53,7 @@ Index: linux-2.4.35.4/net/ipv4/udp.c /* * Charge it to the socket, dropping if the queue is full. */ -@@ -877,6 +880,40 @@ +@@ -877,6 +880,40 @@ static int udp_queue_rcv_skb(struct sock } #endif @@ -94,7 +94,7 @@ Index: linux-2.4.35.4/net/ipv4/udp.c if (sock_queue_rcv_skb(sk,skb)<0) { UDP_INC_STATS_BH(UdpInErrors); IP_INC_STATS_BH(IpInDiscards); -@@ -1100,13 +1137,49 @@ +@@ -1100,13 +1137,49 @@ out: return len; } |