summaryrefslogtreecommitdiff
path: root/include/net/ipip.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 18:11:38 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 18:11:38 -0800
commit1a0153507ffae9cf3350e76c12d441788c0191e1 (patch)
treed05a502b4fc05202c84c1667019460c08ea088cd /include/net/ipip.h
parentb0683ac8928c4cf40646a6ce3eb6ffe94605acfa (diff)
v2.4.3.2 -> v2.4.3.3
- Hui-Fen Hsu: sis900 driver update - NIIBE Yutaka: Super-H update - Alan Cox: more resyncs (ARM down, but more to go) - David Miller: network zerocopy, Sparc sync, qlogic,FC fix, etc. - David Miller/me: get rid of various drivers hacks to do mmap alignment behind the back of the VM layer. Create a real protocol for it.
Diffstat (limited to 'include/net/ipip.h')
-rw-r--r--include/net/ipip.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ipip.h b/include/net/ipip.h
index 398660ca8fb1..ac6438760b0b 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -29,8 +29,9 @@ struct ip_tunnel
int err; \
int pkt_len = skb->len; \
\
+ skb->ip_summed = CHECKSUM_NONE; \
iph->tot_len = htons(skb->len); \
- ip_select_ident(iph, &rt->u.dst); \
+ ip_select_ident(iph, &rt->u.dst, NULL); \
ip_send_check(iph); \
\
err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev, do_ip_send); \