update brcm-2.4 to 2.4.35.4, integrate new broadcom system code, update broadcom...

[openwrt/svn-archive/archive.git] / 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 fc4c29d27ed0e53384df6b630851a5654f1f5e04..7df826347124a4fd67aa6afef46516a7b1a6510d 100644 (file)
--- 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,6 +1,8 @@
 packaging/utils/nattpatch 2.4
---- linux/include/net/sock.h   2002/02/06 15:25:10     1.1
-+++ linux/include/net/sock.h   2002/05/22 12:14:56
+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 @@
        } bictcp;
  };
@@ -26,17 +28,22 @@ packaging/utils/nattpatch 2.4
  
        } tp_pinfo;
  
---- linux/net/Config.in.orig   Fri Feb  9 14:34:13 2001
-+++ linux/net/Config.in        Thu Feb 22 19:40:08 2001
-@@ -88,3 +88,5 @@
+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 @@
+ dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS
  endmenu
  
 +bool 'IPSEC NAT-Traversal' CONFIG_IPSEC_NAT_TRAVERSAL
 +
  endmenu
---- linux/net/ipv4/udp.c.1     Wed Jan 28 15:57:05 2004
-+++ linux/net/ipv4/udp.c       Wed Jan 28 15:58:56 2004
-@@ -787,6 +787,9 @@
+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 @@
  
  static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
  {
@@ -46,7 +53,7 @@ packaging/utils/nattpatch 2.4
        /*
         *      Charge it to the socket, dropping if the queue is full.
         */
-@@ -804,6 +807,40 @@
+@@ -877,6 +880,40 @@
        }
  #endif
  
@@ -87,7 +94,7 @@ packaging/utils/nattpatch 2.4
        if (sock_queue_rcv_skb(sk,skb)<0) {
                UDP_INC_STATS_BH(UdpInErrors);
                IP_INC_STATS_BH(IpInDiscards);
-@@ -1027,13 +1064,49 @@
+@@ -1100,13 +1137,49 @@
        return len;
  }