[NETNS][IPV6] addrconf - Pass the proper network namespace parameters to addrconf

[safe/jmp/linux-2.6] / include / net / ipip.h

diff --git a/include/net/ipip.h b/include/net/ipip.h
index f490c3c..549e132 100644 (file)
--- 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,12 +31,10 @@ 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);\
-       if (err == NET_XMIT_SUCCESS || err == NET_XMIT_CN) {            \
+       err = ip_local_out(skb);                                        \
+       if (net_xmit_eval(err) == 0) {                                  \
                stats->tx_bytes += pkt_len;                             \
                stats->tx_packets++;                                    \
        } else {                                                        \
@@ -44,8 +43,4 @@ struct ip_tunnel
        }                                                               \
 } while (0)
 
-
-extern int     sit_init(void);
-extern void    sit_cleanup(void);
-
 #endif