[kernel] generic-2.6/2.6.24: refresh patches

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 120-openswan-2.4.0.kernel-2.6-natt.patch

diff --git a/target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch b/target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch
index 71b7377..f29b351 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/120-openswan-2.4.0.kernel-2.6-natt.patch
@@ -13,7 +13,7 @@
 +extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
 --- a/net/ipv4/Kconfig
 +++ b/net/ipv4/Kconfig
 +extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
 --- a/net/ipv4/Kconfig
 +++ b/net/ipv4/Kconfig

-@@ -224,6 +224,12 @@
+@@ -224,6 +224,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.
  
          Network), but can be distributed all over the Internet. If you want
          to do that, say Y here and to "IP multicast routing" below.
  


@@ -36,7 +36,7 @@
  
  static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
  {
  
  static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
  {

-@@ -161,6 +162,29 @@
+@@ -161,6 +162,29 @@ drop:

        return 0;
  }
  
        return 0;
  }
  


@@ -66,7 +66,7 @@
  /* If it's a keepalive packet, then just eat it.
   * If it's an encapsulated packet, then pass it to the
   * IPsec xfrm input.
  /* If it's a keepalive packet, then just eat it.
   * If it's an encapsulated packet, then pass it to the
   * IPsec xfrm input.

-@@ -251,7 +275,13 @@
+@@ -251,7 +275,13 @@ int xfrm4_udp_encap_rcv(struct sock *sk,

        iph->protocol = IPPROTO_ESP;
  
        /* process ESP */
        iph->protocol = IPPROTO_ESP;
  
        /* process ESP */


@@ -80,7 +80,7 @@
        return ret;
  
  drop:
        return ret;
  
  drop:

-@@ -265,3 +295,8 @@
+@@ -265,3 +295,8 @@ int xfrm4_rcv(struct sk_buff *skb)

  }
  
  EXPORT_SYMBOL(xfrm4_rcv);
  }
  
  EXPORT_SYMBOL(xfrm4_rcv);