direct-io.hg

view patches/linux-2.6.11/net-csum.patch @ 5517:10e9028c8e3d

bitkeeper revision 1.1718.1.10 (42b7b19aqOS_1M8I4pIOFjiTPYWV-g)

Merge bk://xenbits.xensource.com/xen-unstable.bk
into spot.cl.cam.ac.uk:C:/Documents and Settings/iap10/xen-unstable.bk
author iap10@spot.cl.cam.ac.uk
date Tue Jun 21 06:20:10 2005 +0000 (2005-06-21)
parents ed6682910675
children 56a63f9f378f
line source
1 diff -ur linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_tcp.c linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
2 --- linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2005-05-27 11:47:48 +01:00
3 +++ linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2005-05-27 11:48:07 +01:00
4 @@ -803,6 +803,7 @@
5 */
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, tcplen, IPPROTO_TCP,
10 skb->ip_summed == CHECKSUM_HW ? skb->csum
11 : skb_checksum(skb, iph->ihl*4, tcplen, 0))) {
12 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
13 --- linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2005-05-27 11:47:48 +01:00
14 +++ linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2005-05-27 11:48:07 +01:00
15 @@ -120,6 +120,7 @@
16 * and moreover root might send raw packets.
17 * FIXME: Source route IP option packets --RR */
18 if (hooknum == NF_IP_PRE_ROUTING
19 + && skb->ip_summed != CHECKSUM_UNNECESSARY
20 && csum_tcpudp_magic(iph->saddr, iph->daddr, udplen, IPPROTO_UDP,
21 skb->ip_summed == CHECKSUM_HW ? skb->csum
22 : skb_checksum(skb, iph->ihl*4, udplen, 0))) {