Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / net / ipip.h

diff --git a/include/net/ipip.h b/include/net/ipip.h
index 549e132bca9c834638416182698169175859e80c..a85bda64b8528ce2f7b8c4416ba10e83f654b9af 100644 (file)
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -11,7 +11,6 @@ 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 */
@@ -24,6 +23,16 @@ struct ip_tunnel
        int                     mlink;
 
        struct ip_tunnel_parm   parms;
+
+       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;
 };
 
 #define IPTUNNEL_XMIT() do {                                           \