mfd: Enable twl4030 32kHz oscillator low-power mode

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

diff --git a/include/net/ipip.h b/include/net/ipip.h
index f490c3c..11e8513 100644 (file)
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -2,17 +2,23 @@
 #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)
 
-struct ip_tunnel
-{
+/* 6rd prefix/relay information */
+struct ip_tunnel_6rd_parm {
+       struct in6_addr         prefix;
+       __be32                  relay_prefix;
+       u16                     prefixlen;
+       u16                     relay_prefixlen;
+};
+
+struct ip_tunnel {
        struct ip_tunnel        *next;
        struct net_device       *dev;
-       struct net_device_stats stat;
 
-       int                     recursion;      /* Depth of hard_start_xmit recursion */
        int                     err_count;      /* Number of arrived ICMP errors */
        unsigned long           err_time;       /* Time when the last ICMP error arrived */
 
@@ -23,29 +29,37 @@ struct ip_tunnel
        int                     mlink;
 
        struct ip_tunnel_parm   parms;
+
+       /* for SIT */
+#ifdef CONFIG_IPV6_SIT_6RD
+       struct ip_tunnel_6rd_parm       ip6rd;
+#endif
+       struct ip_tunnel_prl_entry      *prl;           /* potential router list */
+       unsigned int                    prl_count;      /* # of entries in PRL */
+};
+
+struct ip_tunnel_prl_entry {
+       struct ip_tunnel_prl_entry      *next;
+       __be32                          addr;
+       u16                             flags;
+       struct rcu_head                 rcu_head;
 };
 
 #define IPTUNNEL_XMIT() do {                                           \
        int err;                                                        \
-       int pkt_len = skb->len;                                         \
+       int pkt_len = skb->len - skb_transport_offset(skb);             \
                                                                        \
        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) {            \
-               stats->tx_bytes += pkt_len;                             \
-               stats->tx_packets++;                                    \
+       err = ip_local_out(skb);                                        \
+       if (likely(net_xmit_eval(err) == 0)) {                          \
+               txq->tx_bytes += pkt_len;                               \
+               txq->tx_packets++;                                      \
        } else {                                                        \
                stats->tx_errors++;                                     \
                stats->tx_aborted_errors++;                             \
        }                                                               \
 } while (0)
 
-
-extern int     sit_init(void);
-extern void    sit_cleanup(void);
-
 #endif