about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2016-04-24 19:24:36 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-04-24 19:24:36 +0200
commitd454fd21f4366fc529f83fdcd8a1113c5b49853e (patch)
treea2987a6bd323f9f0eb44e5ae7e3875b6522d4abc
parent2a517d91af918aecd9b603b7a09f696d774de3e6 (diff)
downloadglibc-d454fd21f4366fc529f83fdcd8a1113c5b49853e.tar.gz
glibc-d454fd21f4366fc529f83fdcd8a1113c5b49853e.tar.xz
glibc-d454fd21f4366fc529f83fdcd8a1113c5b49853e.zip
non-linux: Apply RFC3542 obsoletion of RFC2292 macros
(IPV6_RECVHOPLIMIT, IPV6_HOPLIMIT, IPV6_RECVHOPOPTS, IPV6_HOPOPTS,
IPV6_RTHDRDSTOPTS, IPV6_RECVRTHDR, IPV6_RTHDR, IPV6_RECVDSTOPTS,
IPV6_DSTOPTS, IPV6_RECVPATHMTU, IPV6_PATHMTU, IPV6_DONTFRAG):
New macros.
-rw-r--r--ChangeLog6
-rw-r--r--bits/in.h12
2 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ae854e0eec..6563baf8e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,8 +10,10 @@
 	(IPV6_RTHDR): Rename to IPV6_2292RTHDR.
 	(IPV6_PKTOPTIONS): Rename to IPV6_2292PKTOPTIONS.
 	(IPV6_HOPLIMIT): Rename to IPV6_2292HOPLIMIT.
-	(IPV6_RECVPKTINFO): New macro.
-	(IPV6_PKTINFO): New macro.
+	(IPV6_RECVPKTINFO, IPV6_PKTINFO, IPV6_RECVHOPLIMIT, IPV6_HOPLIMIT,
+	IPV6_RECVHOPOPTS, IPV6_HOPOPTS, IPV6_RTHDRDSTOPTS, IPV6_RECVRTHDR,
+	IPV6_RTHDR, IPV6_RECVDSTOPTS, IPV6_DSTOPTS, IPV6_RECVPATHMTU,
+	IPV6_PATHMTU, IPV6_DONTFRAG): New macros.
 
 2016-04-23   H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/bits/in.h b/bits/in.h
index a9efc74ed6..d517115bb2 100644
--- a/bits/in.h
+++ b/bits/in.h
@@ -86,6 +86,18 @@ struct ip_opts
 /* Advanced API (RFC3542) (1).  */
 #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
+#define IPV6_RECVPATHMTU	60
+#define IPV6_PATHMTU		61
+#define IPV6_DONTFRAG		62
 
 /* Obsolete synonyms for the above.  */
 #define IPV6_ADD_MEMBERSHIP	IPV6_JOIN_GROUP