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

5 files changed, 46 insertions, 4 deletions

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 228eb4eb3129..f1fbe9c930d7 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -7,6 +7,10 @@
 #define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
 #define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)
 #define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)
+#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)
+#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
+#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
+#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
 
 #define GRE_CSUM        __constant_htons(0x8000)
 #define GRE_ROUTING     __constant_htons(0x4000)
@@ -17,9 +21,6 @@
 #define GRE_FLAGS       __constant_htons(0x00F8)
 #define GRE_VERSION     __constant_htons(0x0007)
 
-/* i_flags values for SIT mode */
-#define SIT_ISATAP      0x0001
-
 struct ip_tunnel_parm
 {
         char                    name[IFNAMSIZ];
@@ -31,4 +32,19 @@ struct ip_tunnel_parm
         struct iphdr            iph;
 };
 
+/* SIT-mode i_flags */
+#define SIT_ISATAP      0x0001
+
+struct ip_tunnel_prl {
+        __be32                  addr;
+        __u16                   flags;
+        __u16                   __reserved;
+        __u32                   datalen;
+        __u32                   __reserved2;
+        void __user             *data;
+};
+
+/* PRL flags */
+#define PRL_DEFAULT             0x0001
+
 #endif /* _IF_TUNNEL_H_ */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index ff72145d5d9e..e517701c25ba 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -313,7 +313,10 @@ struct sk_buff {
         __u16                   tc_verd;        /* traffic control verdict */
 #endif
 #endif
-        /* 2 byte hole */
+#ifdef CONFIG_IPV6_NDISC_NODETYPE
+        __u8                    ndisc_nodetype:2;
+#endif
+        /* 14 bit hole */
 
 #ifdef CONFIG_NET_DMA
         dma_cookie_t            dma_cookie;
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
  */