2 files changed, 4 insertions, 3 deletions

diff --git a/include/net/ip.h b/include/net/ip.h
index 50c8889b1b8d..66d51616ade8 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -102,6 +102,8 @@ extern int		ip_mc_output(struct sk_buff *skb);
 extern int              ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));
 extern int              ip_do_nat(struct sk_buff *skb);
 extern void             ip_send_check(struct iphdr *ip);
+extern int              __ip_local_out(struct sk_buff *skb);
+extern int              ip_local_out(struct sk_buff *skb);
 extern int              ip_queue_xmit(struct sk_buff *skb, int ipfragok);
 extern void             ip_init(void);
 extern int              ip_append_data(struct sock *sk,
diff --git a/include/net/ipip.h b/include/net/ipip.h
index 7cdc914322f0..549e132bca9c 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -2,6 +2,7 @@
 #define __NET_IPIP_H 1
 
 #include <linux/if_tunnel.h>
+#include <net/ip.h>
 
 /* Keep error state on tunnel for 30 sec */
 #define IPTUNNEL_ERR_TIMEO      (30*HZ)
@@ -30,11 +31,9 @@ struct ip_tunnel
         int pkt_len = skb->len;                                         \
                                                                         \
         skb->ip_summed = CHECKSUM_NONE;                                 \
-        iph->tot_len = htons(skb->len);                                 \
         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, dst_output);\
+        err = ip_local_out(skb);                                        \
         if (net_xmit_eval(err) == 0) {                                  \
                 stats->tx_bytes += pkt_len;                             \
                 stats->tx_packets++;                                    \