Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

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

diff --git a/include/linux/in6.h b/include/linux/in6.h
index 50cdc3ad61a7fd966bfead3ddf16ac65a38bbd64..304aaedea305dadd18748fda4cdd96d6e2408ace 100644 (file)
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -221,6 +221,20 @@ struct in6_flowlabel_req
 #define IPV6_DONTFRAG          62
 #define IPV6_USE_MIN_MTU       63
 #endif
+
+/*
+ * Netfilter
+ *
+ * Following socket options are used in ip6_tables;
+ * see include/linux/netfilter_ipv6/ip6_tables.h.
+ *
+ * IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO              64
+ * IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES      65
+ */
+
+/*
+ * Advanced API (RFC3542) (2)
+ */
 #define IPV6_RECVTCLASS                66
 #define IPV6_TCLASS            67