source: trunk/packages/xen-3.1/xen-3.1/patches/linux-2.6.18/net-csum.patch @ 34

net/ipv4/netfilter/ip_nat_proto_tcp.c

@@ -129 +129 @@
         if (hdrsize < sizeof(*hdr))
                 return 1;
 
-        hdr->check = ip_nat_cheat_check(~oldip, newip,
+#ifdef CONFIG_XEN
+        if ((*pskb)->proto_csum_blank)
+                hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
+        else
+#endif
+                hdr->check = ip_nat_cheat_check(~oldip, newip,
                                         ip_nat_cheat_check(oldport ^ 0xFFFF,
                                                            newport,
                                                            hdr->check));

net/ipv4/netfilter/ip_nat_proto_udp.c

@@ -113 +113 @@
                 newport = tuple->dst.u.udp.port;
                 portptr = &hdr->dest;
         }
-        if (hdr->check) /* 0 is a special case meaning no checksum */
-                hdr->check = ip_nat_cheat_check(~oldip, newip,
+        if (hdr->check) { /* 0 is a special case meaning no checksum */
+#ifdef CONFIG_XEN
+                if ((*pskb)->proto_csum_blank)
+                        hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
+                else
+#endif
+                        hdr->check = ip_nat_cheat_check(~oldip, newip,
                                         ip_nat_cheat_check(*portptr ^ 0xFFFF,
                                                            newport,
                                                            hdr->check));
+        }
         *portptr = newport;
         return 1;
 }

net/ipv4/xfrm4_output.c

@@ -18 +18 @@
 #include <net/xfrm.h>
 #include <net/icmp.h>
 
+extern int skb_checksum_setup(struct sk_buff *skb);
+
 static int xfrm4_tunnel_check_size(struct sk_buff *skb)
 {
         int mtu, ret = 0;
@@ -48 +50 @@
         struct xfrm_state *x = dst->xfrm;
         int err;
         
+        err = skb_checksum_setup(skb);
+        if (err)
+                goto error_nolock;
+
         if (skb->ip_summed == CHECKSUM_HW) {
                 err = skb_checksum_help(skb, 0);
                 if (err)