[scripts] getver: don't use "-r COMMITTED" arg which needs network access to the...

[openwrt.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 7df8263..51981b8 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,9 +1,7 @@
 packaging/utils/nattpatch 2.4
 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 @@
+--- a/include/net/sock.h
++++ b/include/net/sock.h
+@@ -488,7 +488,13 @@ struct tcp_opt {

        } bictcp;
  };
  
        } bictcp;
  };
  


@@ -18,7 +16,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
  /*
   * 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 */
  #if defined(CONFIG_SPX) || defined (CONFIG_SPX_MODULE)
                struct spx_opt          af_spx;
  #endif /* CONFIG_SPX */


@@ -28,22 +26,18 @@ Index: linux-2.4.35.4/include/net/sock.h
  
        } tp_pinfo;
  
  
        } tp_pinfo;
  

-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 @@
+--- 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
  
 +bool 'IPSEC NAT-Traversal' CONFIG_IPSEC_NAT_TRAVERSAL
 +
  endmenu
  dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS
  endmenu
  
 +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 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 @@
+--- 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)
  {
  
  static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
  {


@@ -53,7 +47,7 @@ Index: linux-2.4.35.4/net/ipv4/udp.c
        /*
         *      Charge it to the socket, dropping if the queue is full.
         */
        /*
         *      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
  
        }
  #endif
  


@@ -94,7 +88,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);
        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;
  }
  
        return len;
  }