pagemap: fix pfn calculation for hugepage

[safe/jmp/linux-2.6] / include / linux / in6.h

diff --git a/include/linux/in6.h b/include/linux/in6.h
index f674000..bd55c6e 100644 (file)
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -27,10 +27,8 @@
  *     IPv6 address structure
  */
 
-struct in6_addr
-{
-       union 
-       {
+struct in6_addr {
+       union {
                __u8            u6_addr8[16];
                __be16          u6_addr16[8];
                __be32          u6_addr32[4];
@@ -44,10 +42,18 @@ struct in6_addr
  * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined
  * in network byte order, not in host byte order as are the IPv4 equivalents
  */
+#ifdef __KERNEL__
 extern const struct in6_addr in6addr_any;
 #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
 extern const struct in6_addr in6addr_loopback;
 #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
+extern const struct in6_addr in6addr_linklocal_allnodes;
+#define IN6ADDR_LINKLOCAL_ALLNODES_INIT        \
+               { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
+extern const struct in6_addr in6addr_linklocal_allrouters;
+#define IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \
+               { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } }
+#endif
 
 struct sockaddr_in6 {
        unsigned short int      sin6_family;    /* AF_INET6 */
@@ -67,8 +73,7 @@ struct ipv6_mreq {
 
 #define ipv6mr_acaddr  ipv6mr_multiaddr
 
-struct in6_flowlabel_req
-{
+struct in6_flowlabel_req {
        struct in6_addr flr_dst;
        __be32  flr_label;
        __u8    flr_action;
@@ -105,7 +110,7 @@ struct in6_flowlabel_req
 #define IPV6_FLOWINFO_FLOWLABEL                0x000fffff
 #define IPV6_FLOWINFO_PRIORITY         0x0ff00000
 
-/* These defintions are obsolete */
+/* These definitions are obsolete */
 #define IPV6_PRIORITY_UNCHARACTERIZED  0x0000
 #define IPV6_PRIORITY_FILLER           0x0100
 #define IPV6_PRIORITY_UNATTENDED       0x0200
@@ -260,4 +265,19 @@ struct in6_flowlabel_req
 #define IPV6_PREFER_SRC_CGA            0x0008
 #define IPV6_PREFER_SRC_NONCGA         0x0800
 
+/*
+ * Multicast Routing:
+ * see include/linux/mroute6.h.
+ *
+ * MRT6_INIT                   200
+ * MRT6_DONE                   201
+ * MRT6_ADD_MIF                        202
+ * MRT6_DEL_MIF                        203
+ * MRT6_ADD_MFC                        204
+ * MRT6_DEL_MFC                        205
+ * MRT6_VERSION                        206
+ * MRT6_ASSERT                 207
+ * MRT6_PIM                    208
+ * (reserved)                  209
+ */
 #endif