mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 18:21:39 +01:00
Christian Limpach
13b3232ba7
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com> --HG-- rename : patches/linux-2.6.16.13/blktap-aio-16_03_06.patch => patches/linux-2.6.16.29/blktap-aio-16_03_06.patch rename : patches/linux-2.6.16.13/device_bind.patch => patches/linux-2.6.16.29/device_bind.patch rename : patches/linux-2.6.16.13/fix-hz-suspend.patch => patches/linux-2.6.16.29/fix-hz-suspend.patch rename : patches/linux-2.6.16.13/fix-ide-cd-pio-mode.patch => patches/linux-2.6.16.29/fix-ide-cd-pio-mode.patch rename : patches/linux-2.6.16.13/i386-mach-io-check-nmi.patch => patches/linux-2.6.16.29/i386-mach-io-check-nmi.patch rename : patches/linux-2.6.16.13/ipv6-no-autoconf.patch => patches/linux-2.6.16.29/ipv6-no-autoconf.patch rename : patches/linux-2.6.16.13/net-csum.patch => patches/linux-2.6.16.29/net-csum.patch rename : patches/linux-2.6.16.13/net-gso-0-base.patch => patches/linux-2.6.16.29/net-gso-0-base.patch rename : patches/linux-2.6.16.13/net-gso-1-check-dodgy.patch => patches/linux-2.6.16.29/net-gso-1-check-dodgy.patch rename : patches/linux-2.6.16.13/net-gso-2-checksum-fix.patch => patches/linux-2.6.16.29/net-gso-2-checksum-fix.patch rename : patches/linux-2.6.16.13/net-gso-3-fix-errorcheck.patch => patches/linux-2.6.16.29/net-gso-3-fix-errorcheck.patch rename : patches/linux-2.6.16.13/net-gso-4-kill-warnon.patch => patches/linux-2.6.16.29/net-gso-4-kill-warnon.patch rename : patches/linux-2.6.16.13/pmd-shared.patch => patches/linux-2.6.16.29/pmd-shared.patch rename : patches/linux-2.6.16.13/rcu_needs_cpu.patch => patches/linux-2.6.16.29/rcu_needs_cpu.patch rename : patches/linux-2.6.16.13/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch => patches/linux-2.6.16.29/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch rename : patches/linux-2.6.16.13/series => patches/linux-2.6.16.29/series rename : patches/linux-2.6.16.13/smp-alts.patch => patches/linux-2.6.16.29/smp-alts.patch rename : patches/linux-2.6.16.13/tpm_plugin_2.6.17.patch => patches/linux-2.6.16.29/tpm_plugin_2.6.17.patch rename : patches/linux-2.6.16.13/x86-elfnote-as-preprocessor-macro.patch => patches/linux-2.6.16.29/x86-elfnote-as-preprocessor-macro.patch rename : patches/linux-2.6.16.13/x86-increase-interrupt-vector-range.patch => patches/linux-2.6.16.29/x86-increase-interrupt-vector-range.patch rename : patches/linux-2.6.16.13/x86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch => patches/linux-2.6.16.29/x86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch rename : patches/linux-2.6.16.13/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch => patches/linux-2.6.16.29/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch rename : patches/linux-2.6.16.13/xen-hotplug.patch => patches/linux-2.6.16.29/xen-hotplug.patch rename : patches/linux-2.6.16.13/xenoprof-generic.patch => patches/linux-2.6.16.29/xenoprof-generic.patch
64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
diff -pruN ../orig-linux-2.6.16.29/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c
|
|
--- ../orig-linux-2.6.16.29/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-09-12 19:02:10.000000000 +0100
|
|
+++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-09-19 13:59:15.000000000 +0100
|
|
@@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
|
|
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));
|
|
diff -pruN ../orig-linux-2.6.16.29/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c
|
|
--- ../orig-linux-2.6.16.29/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-09-12 19:02:10.000000000 +0100
|
|
+++ ./net/ipv4/netfilter/ip_nat_proto_udp.c 2006-09-19 13:59:15.000000000 +0100
|
|
@@ -113,11 +113,17 @@ udp_manip_pkt(struct sk_buff **pskb,
|
|
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;
|
|
}
|
|
diff -pruN ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c ./net/ipv4/xfrm4_output.c
|
|
--- ../orig-linux-2.6.16.29/net/ipv4/xfrm4_output.c 2006-09-12 19:02:10.000000000 +0100
|
|
+++ ./net/ipv4/xfrm4_output.c 2006-09-19 13:59:15.000000000 +0100
|
|
@@ -17,6 +17,8 @@
|
|
#include <net/xfrm.h>
|
|
#include <net/icmp.h>
|
|
|
|
+extern int skb_checksum_setup(struct sk_buff *skb);
|
|
+
|
|
/* Add encapsulation header.
|
|
*
|
|
* In transport mode, the IP header will be moved forward to make space
|
|
@@ -103,6 +105,10 @@ static int xfrm4_output_one(struct sk_bu
|
|
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)
|