Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev

3 files changed, 23 insertions, 0 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index d89b0bc7ab75..bdcc863a60a4 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -71,6 +71,10 @@ extern int			ipv6_chk_addr(struct net *net,
 extern int                      ipv6_chk_home_addr(struct net *net,
                                                    struct in6_addr *addr);
 #endif
+
+extern int                      ipv6_chk_prefix(struct in6_addr *addr,
+                                                struct net_device *dev);
+
 extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,
                                                  struct in6_addr *addr,
                                                  struct net_device *dev,
diff --git a/include/net/ipip.h b/include/net/ipip.h
index 549e132bca9c..633ed4def8e3 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 {                                            \
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 5aedf324de66..9f2bae68d28c 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -12,6 +12,15 @@
 #define NDISC_REDIRECT                  137
 
 /*
+ * Router type: cross-layer information from link-layer to
+ * IPv6 layer reported by certain link types (e.g., RFC4214).
+ */
+#define NDISC_NODETYPE_UNSPEC           0       /* unspecified (default) */
+#define NDISC_NODETYPE_HOST             1       /* host or unauthorized router */
+#define NDISC_NODETYPE_NODEFAULT        2       /* non-default router */
+#define NDISC_NODETYPE_DEFAULT          3       /* default router */
+
+/*
  *      ndisc options
  */