aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 17:42:47 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 17:42:47 -0700
commit2f79f458d2ab4a77f1b9df8d0041e51ce085d7c0 (patch)
tree0f6652830f84a1150c72094c572ab83fe502b057 /include
parent2d21247998c5d183179a7e822c4032974a53ff49 (diff)
parente130af5dab2abbf01c5d92ec5ac05912cf3d9aa7 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
-rw-r--r--include/linux/in6.h56
-rw-r--r--include/linux/ipv6.h2
2 files changed, 37 insertions, 21 deletions
diff --git a/include/linux/in6.h b/include/linux/in6.h
index bd32b79d629..304aaedea30 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -198,27 +198,43 @@ struct in6_flowlabel_req
* MCAST_MSFILTER 48
*/
-/* RFC3542 advanced socket options (50-67) */
-#define IPV6_RECVPKTINFO 50
-#define IPV6_PKTINFO 51
-#if 0
-#define IPV6_RECVPATHMTU 52
-#define IPV6_PATHMTU 53
-#define IPV6_DONTFRAG 54
-#define IPV6_USE_MIN_MTU 55
-#endif
-#define IPV6_RECVHOPOPTS 56
-#define IPV6_HOPOPTS 57
-#if 0
-#define IPV6_RECVRTHDRDSTOPTS 58 /* Unused, see net/ipv6/datagram.c */
+/*
+ * Advanced API (RFC3542) (1)
+ *
+ * Note: IPV6_RECVRTHDRDSTOPTS does not exist. see net/ipv6/datagram.c.
+ */
+
+#define IPV6_RECVPKTINFO 49
+#define IPV6_PKTINFO 50
+#define IPV6_RECVHOPLIMIT 51
+#define IPV6_HOPLIMIT 52
+#define IPV6_RECVHOPOPTS 53
+#define IPV6_HOPOPTS 54
+#define IPV6_RTHDRDSTOPTS 55
+#define IPV6_RECVRTHDR 56
+#define IPV6_RTHDR 57
+#define IPV6_RECVDSTOPTS 58
+#define IPV6_DSTOPTS 59
+#if 0 /* not yet */
+#define IPV6_RECVPATHMTU 60
+#define IPV6_PATHMTU 61
+#define IPV6_DONTFRAG 62
+#define IPV6_USE_MIN_MTU 63
#endif
-#define IPV6_RTHDRDSTOPTS 59
-#define IPV6_RECVRTHDR 60
-#define IPV6_RTHDR 61
-#define IPV6_RECVDSTOPTS 62
-#define IPV6_DSTOPTS 63
-#define IPV6_RECVHOPLIMIT 64
-#define IPV6_HOPLIMIT 65
+
+/*
+ * 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
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 6c5f7b39a4b..bb6f88e1406 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -68,7 +68,7 @@ struct ipv6_opt_hdr {
struct rt0_hdr {
struct ipv6_rt_hdr rt_hdr;
- __u32 bitmap; /* strict/loose bit map */
+ __u32 reserved;
struct in6_addr addr[0];
#define rt0_type rt_hdr.type