netfilter-2.6/patch-o-matic-ng: branches/vanilla-2.6.12.x/net/ipv4/netfilter/ip_conntrack_proto_udp....

[pluto]

Author: pluto
Date: Wed Jun 22 14:28:09 2005
New Revision: 6164

Modified:
   netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/netfilter/ip_conntrack_proto_udp.c
   netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c
Log:
- ops, fix commited into wrong branch.


Modified: netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/netfilter/ip_conntrack_proto_udp.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/netfilter/ip_conntrack_proto_udp.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/netfilter/ip_conntrack_proto_udp.c	Wed Jun 22 14:28:09 2005
@@ -120,7 +120,6 @@
 	 * and moreover root might send raw packets.
 	 * FIXME: Source route IP option packets --RR */
 	if (hooknum == NF_IP_PRE_ROUTING
-	    && skb->ip_summed != CHECKSUM_UNNECESSARY
 	    && csum_tcpudp_magic(iph->saddr, iph->daddr, udplen, IPPROTO_UDP,
 			         skb->ip_summed == CHECKSUM_HW ? skb->csum
 			      	 : skb_checksum(skb, iph->ihl*4, udplen, 0))) {

Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c	Wed Jun 22 14:28:09 2005
@@ -121,6 +121,7 @@
 	 * and moreover root might send raw packets.
 	 * FIXME: Source route IP option packets --RR */
 	if (hooknum == NF_IP_PRE_ROUTING
+	    && skb->ip_summed != CHECKSUM_UNNECESSARY
 	    && csum_tcpudp_magic(iph->saddr, iph->daddr, udplen, IPPROTO_UDP,
 			         skb->ip_summed == CHECKSUM_HW ? skb->csum
 			      	 : skb_checksum(skb, iph->ihl*4, udplen, 0))) {