SOURCES (LINUX_2_6): kernel-pom-ng-ROUTE.patch - more

[zbyniu]

Author: zbyniu                       Date: Thu May  8 09:51:48 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- more

---- Files affected:
SOURCES:
   kernel-pom-ng-ROUTE.patch (1.1.2.8 -> 1.1.2.9) 

---- Diffs:

================================================================
Index: SOURCES/kernel-pom-ng-ROUTE.patch
diff -u SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.8 SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.9
--- SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.8	Thu May  8 03:12:15 2008
+++ SOURCES/kernel-pom-ng-ROUTE.patch	Thu May  8 11:51:43 2008
@@ -389,8 +389,8 @@
 +	/* If we are at PREROUTING or INPUT hook
 +	 * the TTL isn't decreased by the IP stack
 +	 */
-+	if (hooknum == NF_IP_PRE_ROUTING ||
-+	    hooknum == NF_IP_LOCAL_IN) {
++	if (hooknum == NF_INET_PRE_ROUTING ||
++	    hooknum == NF_INET_LOCAL_IN) {
 +
 +		struct iphdr *iph = ip_hdr(skb);
 +
@@ -432,7 +432,7 @@
 +		 * If we are at INPUT the checksum must be recalculated since
 +		 * the length could change as the result of a defragmentation.
 +		 */
-+		if(hooknum == NF_IP_LOCAL_IN) {
++		if(hooknum == NF_INET_LOCAL_IN) {
 +			iph->ttl = iph->ttl - 1;
 +			iph->check = 0;
 +			iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
@@ -502,11 +502,11 @@
 +		return 0;
 +	}
 +
-+	if (hook_mask & ~(  (1 << NF_IP_PRE_ROUTING)
-+			    | (1 << NF_IP_LOCAL_IN)
-+			    | (1 << NF_IP_FORWARD)
-+			    | (1 << NF_IP_LOCAL_OUT)
-+			    | (1 << NF_IP_POST_ROUTING))) {
++	if (hook_mask & ~(  (1 << NF_INET_PRE_ROUTING)
++			    | (1 << NF_INET_LOCAL_IN)
++			    | (1 << NF_INET_FORWARD)
++			    | (1 << NF_INET_LOCAL_OUT)
++			    | (1 << NF_INET_POST_ROUTING))) {
 +		printk("ipt_ROUTE: bad hook\n");
 +		return 0;
 +	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-pom-ng-ROUTE.patch?r1=1.1.2.8&r2=1.1.2.9&f=u