|
 |
147e83 |
commit 76e5216e317f39da2bc5bf905721cd9554ee6d09
|
|
|
147e83 |
Author: Joseph Myers <joseph@codesourcery.com>
|
|
|
147e83 |
Date: Mon Jun 23 15:48:42 2014 +0000
|
|
|
147e83 |
|
|
|
147e83 |
Update headers for Linux 3.15.
|
|
|
147e83 |
|
|
|
147e83 |
This patch updates glibc headers for changes / new definitions in
|
|
|
147e83 |
Linux 3.15. In the course of my review I noticed that
|
|
|
147e83 |
IPV6_PMTUDISC_INTERFACE was absent from glibc despite the inclusion of
|
|
|
147e83 |
IP_PMTUDISC_INTERFACE; I added it along with IP_PMTUDISC_OMIT and
|
|
|
147e83 |
IPV6_PMTUDISC_OMIT. I did not add FALLOC_FL_NO_HIDE_STALE given the
|
|
|
147e83 |
kernel header comment that it is reserved.
|
|
|
147e83 |
|
|
|
147e83 |
Tested x86_64.
|
|
|
147e83 |
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_GNU]
|
|
|
147e83 |
(FALLOC_FL_COLLAPSE_RANGE): New macro.
|
|
|
147e83 |
[__USE_GNU] (FALLOC_FL_ZERO_RANGE): Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/bits/in.h (IP_PMTUDISC_OMIT): Likewise.
|
|
|
147e83 |
(IPV6_PMTUDISC_INTERFACE): Likewise.
|
|
|
147e83 |
(IPV6_PMTUDISC_OMIT): Likewise.
|
|
|
147e83 |
|
|
|
147e83 |
Only the sysdeps/unix/sysv/linux/bits/in.h part is backported in this
|
|
|
147e83 |
patch. The sysdeps/unix/sysv/linux/bits/fcntl-linux.h part was
|
|
|
147e83 |
completely superseded by glibc-rh1476120.patch, which uses
|
|
|
147e83 |
<linux/falloc.h> in favor of duplicated constants.
|
|
|
147e83 |
|
|
|
147e83 |
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
|
|
|
147e83 |
index ac07d17d0e9dc9c9..23046d3b5a6b0d91 100644
|
|
|
147e83 |
--- a/sysdeps/unix/sysv/linux/bits/in.h
|
|
|
147e83 |
+++ b/sysdeps/unix/sysv/linux/bits/in.h
|
|
|
147e83 |
@@ -109,6 +109,8 @@
|
|
|
147e83 |
Also incoming ICMP frag_needed notifications will be ignored on
|
|
|
147e83 |
this socket to prevent accepting spoofed ones. */
|
|
|
147e83 |
#define IP_PMTUDISC_INTERFACE 4
|
|
|
147e83 |
+/* Like IP_PMTUDISC_INTERFACE but allow packets to be fragmented. */
|
|
|
147e83 |
+#define IP_PMTUDISC_OMIT 5
|
|
|
147e83 |
|
|
|
147e83 |
#define IP_MULTICAST_IF 32
|
|
|
147e83 |
#define IP_MULTICAST_TTL 33
|
|
|
147e83 |
@@ -224,6 +226,8 @@ struct in_pktinfo
|
|
|
147e83 |
#define IPV6_PMTUDISC_WANT 1 /* Use per route hints. */
|
|
|
147e83 |
#define IPV6_PMTUDISC_DO 2 /* Always DF. */
|
|
|
147e83 |
#define IPV6_PMTUDISC_PROBE 3 /* Ignore dst pmtu. */
|
|
|
147e83 |
+#define IPV6_PMTUDISC_INTERFACE 4 /* See IP_PMTUDISC_INTERFACE. */
|
|
|
147e83 |
+#define IPV6_PMTUDISC_OMIT 5 /* See IP_PMTUDISC_OMIT. */
|
|
|
147e83 |
|
|
|
147e83 |
/* Socket level values for IPv6. */
|
|
|
147e83 |
#define SOL_IPV6 41
|