git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ip_nat_proto_tcp.c
diff --git
a/net/ipv4/netfilter/ip_nat_proto_tcp.c
b/net/ipv4/netfilter/ip_nat_proto_tcp.c
index
35d1d90
..
a3d1407
100644
(file)
--- a/
net/ipv4/netfilter/ip_nat_proto_tcp.c
+++ b/
net/ipv4/netfilter/ip_nat_proto_tcp.c
@@
-129,12
+129,7
@@
tcp_manip_pkt(struct sk_buff **pskb,
if (hdrsize < sizeof(*hdr))
return 1;
if (hdrsize < sizeof(*hdr))
return 1;
-#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,
+ hdr->check = ip_nat_cheat_check(~oldip, newip,
ip_nat_cheat_check(oldport ^ 0xFFFF,
newport,
hdr->check));
ip_nat_cheat_check(oldport ^ 0xFFFF,
newport,
hdr->check));