aboutsummaryrefslogtreecommitdiff
path: root/include/net/ipip.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-08 02:33:36 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-08 02:33:36 -0700
commit8eefca4888c986d993b2571eb31f0397a5d0a178 (patch)
treeadc659aba0eaaaaa3d33db20d7c759dfc5f0669b /include/net/ipip.h
parent549e028d012fab01e5726943d4afecd0c33d64e6 (diff)
parentde357cc01334a468e4d5b7ba66a17b0d3ca9d63e (diff)
Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
Diffstat (limited to 'include/net/ipip.h')
-rw-r--r--include/net/ipip.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/net/ipip.h b/include/net/ipip.h
index 549e132bca9..633ed4def8e 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -24,6 +24,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 { \