ia64/xen-unstable

view patches/linux-2.6.12/net-csum.patch @ 6854:9af349b055e5

Merge latest xen-unstable into xen-ia64-unstable to prep
for push back to xen-unstable
author djm@kirby.fc.hp.com
date Wed Sep 14 15:36:10 2005 -0600 (2005-09-14)
parents b35215021b32 dd668f7527cb
children 3233e7ecfa9f 06d84bf87159
line source
1 diff -ur linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_udp.c linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_udp.c
2 --- linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2005-05-27 11:47:48 +01:00
3 +++ linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2005-05-27 11:48:07 +01:00
4 @@ -120,6 +120,7 @@
5 * and moreover root might send raw packets.
6 * FIXME: Source route IP option packets --RR */
7 if (hooknum == NF_IP_PRE_ROUTING
8 + && skb->ip_summed != CHECKSUM_UNNECESSARY
9 && csum_tcpudp_magic(iph->saddr, iph->daddr, udplen, IPPROTO_UDP,
10 skb->ip_summed == CHECKSUM_HW ? skb->csum
11 : skb_checksum(skb, iph->ihl*4, udplen, 0))) {