SOURCES (LINUX_2_6_25): kernel-tproxy.patch - updated

[arekm]

Author: arekm                        Date: Mon Nov 10 22:28:07 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6_25
---- Log message:
- updated

---- Files affected:
SOURCES:
   kernel-tproxy.patch (1.1.2.1 -> 1.1.2.1.2.1) 

---- Diffs:

================================================================
Index: SOURCES/kernel-tproxy.patch
diff -u SOURCES/kernel-tproxy.patch:1.1.2.1 SOURCES/kernel-tproxy.patch:1.1.2.1.2.1
--- SOURCES/kernel-tproxy.patch:1.1.2.1	Wed May 14 19:29:37 2008
+++ SOURCES/kernel-tproxy.patch	Mon Nov 10 23:28:01 2008
@@ -752,8 +752,8 @@
  static int ipv4_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
  			    unsigned int *dataoff, u_int8_t *protonum)
  {
-@@ -144,28 +129,6 @@ out:
- 	return nf_conntrack_confirm(skb);
+@@ -117,30 +117,6 @@
+ 			    ct, ctinfo);
  }
  
 -static unsigned int ipv4_conntrack_defrag(unsigned int hooknum,
@@ -762,10 +762,12 @@
 -					  const struct net_device *out,
 -					  int (*okfn)(struct sk_buff *))
 -{
+-#if !defined(CONFIG_NF_NAT) && !defined(CONFIG_NF_NAT_MODULE)
 -	/* Previously seen (loopback)?  Ignore.  Do this before
 -	   fragment check. */
 -	if (skb->nfct)
 -		return NF_ACCEPT;
+-#endif
 -
 -	/* Gather fragments. */
 -	if (ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-tproxy.patch?r1=1.1.2.1&r2=1.1.2.1.2.1&f=u