diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-05-27 10:51:06 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-05-27 10:51:06 +0000 |
| commit | 1590d44963217a9cd0eaa4818af172b7e79d31ad (patch) | |
| tree | 94626799847c3136f46a08b7c643915b7d464bcd | |
| parent | 7b97cafdde69519c69d7cd56f572c6a1cc73f723 (diff) | |
| download | xen-1590d44963217a9cd0eaa4818af172b7e79d31ad.tar.gz xen-1590d44963217a9cd0eaa4818af172b7e79d31ad.tar.bz2 xen-1590d44963217a9cd0eaa4818af172b7e79d31ad.zip | |
bitkeeper revision 1.1575 (4296fb9akkrLM8bKzQ1I7T3Dy3Uu9w)
Patch ipv4 netfilter code to avoid checksumming CHECKUM_UNNCECESSARY
packets. On Xen the check could fail, as packets from domU have a blank
checksum field.
Signed-off-by: Keir Fraser <keir@xensource.com>
| -rw-r--r-- | .rootkeys | 1 | ||||
| -rw-r--r-- | patches/linux-2.6.11/net-csum.patch | 22 |
2 files changed, 23 insertions, 0 deletions
@@ -470,6 +470,7 @@ 427261074Iy1MkbbqIV6zdZDWWx_Jg patches/linux-2.6.11/i386-cpu-hotplug-updated-for-mm.patch 42372652KCUP-IOH9RN19YQmGhs4aA patches/linux-2.6.11/iomap.patch 428359d4b3fDYtazwXi4UUmSWaOUew patches/linux-2.6.11/linux-2.6.11.10.patch +4296fb998LGSWCcljGKbOCUv3h9uRQ patches/linux-2.6.11/net-csum.patch 424f001e_M1Tnxc52rDrmCLelnDWMQ patches/linux-2.6.11/x86_64-linux.patch 3f776bd1Hy9rn69ntXBhPReUFw9IEA tools/Makefile 40e1b09db5mN69Ijj0X_Eol-S7dXiw tools/Rules.mk diff --git a/patches/linux-2.6.11/net-csum.patch b/patches/linux-2.6.11/net-csum.patch new file mode 100644 index 0000000000..115cc1ed13 --- /dev/null +++ b/patches/linux-2.6.11/net-csum.patch @@ -0,0 +1,22 @@ +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 +--- linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2005-05-27 11:47:48 +01:00 ++++ linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2005-05-27 11:48:07 +01:00 +@@ -803,6 +803,7 @@ + */ + /* 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, tcplen, IPPROTO_TCP, + skb->ip_summed == CHECKSUM_HW ? skb->csum + : skb_checksum(skb, iph->ihl*4, tcplen, 0))) { +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 +--- linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2005-05-27 11:47:48 +01:00 ++++ linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2005-05-27 11:48:07 +01:00 +@@ -120,6 +120,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))) { |