git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
e1000: FIX: Stop raw interrupts disabled nag from RT
[pandora-kernel.git]
/
net
/
ipv4
/
netfilter
/
ip_nat_proto_gre.c
diff --git
a/net/ipv4/netfilter/ip_nat_proto_gre.c
b/net/ipv4/netfilter/ip_nat_proto_gre.c
index
bf91f93
..
9581020
100644
(file)
--- a/
net/ipv4/netfilter/ip_nat_proto_gre.c
+++ b/
net/ipv4/netfilter/ip_nat_proto_gre.c
@@
-129,11
+129,9
@@
gre_manip_pkt(struct sk_buff **pskb,
}
if (greh->csum) {
/* FIXME: Never tested this code... */
}
if (greh->csum) {
/* FIXME: Never tested this code... */
- *(gre_csum(greh)) =
- nf_proto_csum_update(*pskb,
- ~*(gre_key(greh)),
- tuple->dst.u.gre.key,
- *(gre_csum(greh)), 0);
+ nf_proto_csum_replace4(gre_csum(greh), *pskb,
+ *(gre_key(greh)),
+ tuple->dst.u.gre.key, 0);
}
*(gre_key(greh)) = tuple->dst.u.gre.key;
break;
}
*(gre_key(greh)) = tuple->dst.u.gre.key;
break;