aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-06-23 15:48:42 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-06-23 15:48:42 +0000
commit76e5216e317f39da2bc5bf905721cd9554ee6d09 (patch)
treefdeb2c7b7fb6db54cd8596bd526cddd791b7ad04
parent7a81cbcc3968fa8549f17ef64bd01d8112d0bbe5 (diff)
downloadglibc-76e5216e317f39da2bc5bf905721cd9554ee6d09.tar
glibc-76e5216e317f39da2bc5bf905721cd9554ee6d09.tar.gz
glibc-76e5216e317f39da2bc5bf905721cd9554ee6d09.tar.bz2
glibc-76e5216e317f39da2bc5bf905721cd9554ee6d09.zip
Update headers for Linux 3.15.
This patch updates glibc headers for changes / new definitions in Linux 3.15. In the course of my review I noticed that IPV6_PMTUDISC_INTERFACE was absent from glibc despite the inclusion of IP_PMTUDISC_INTERFACE; I added it along with IP_PMTUDISC_OMIT and IPV6_PMTUDISC_OMIT. I did not add FALLOC_FL_NO_HIDE_STALE given the kernel header comment that it is reserved. Tested x86_64. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_GNU] (FALLOC_FL_COLLAPSE_RANGE): New macro. [__USE_GNU] (FALLOC_FL_ZERO_RANGE): Likewise. * sysdeps/unix/sysv/linux/bits/in.h (IP_PMTUDISC_OMIT): Likewise. (IPV6_PMTUDISC_INTERFACE): Likewise. (IPV6_PMTUDISC_OMIT): Likewise.
-rw-r--r--ChangeLog9
-rw-r--r--sysdeps/unix/sysv/linux/bits/fcntl-linux.h5
-rw-r--r--sysdeps/unix/sysv/linux/bits/in.h4
3 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bbd0698cd3..2259423233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-23 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_GNU]
+ (FALLOC_FL_COLLAPSE_RANGE): New macro.
+ [__USE_GNU] (FALLOC_FL_ZERO_RANGE): Likewise.
+ * sysdeps/unix/sysv/linux/bits/in.h (IP_PMTUDISC_OMIT): Likewise.
+ (IPV6_PMTUDISC_INTERFACE): Likewise.
+ (IPV6_PMTUDISC_OMIT): Likewise.
+
2014-06-23 Andreas Schwab <schwab@suse.de>
* nptl/sysdeps/unix/sysv/linux/mq_notify.c (init_mq_netlink):
diff --git a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
index 915eb3ede5..527eb5c8b5 100644
--- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
+++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
@@ -305,6 +305,11 @@ struct f_owner_ex
even if offset + len is
greater than file size. */
# define FALLOC_FL_PUNCH_HOLE 2 /* Create a hole in the file. */
+# define FALLOC_FL_COLLAPSE_RANGE 8 /* Remove a range of a file
+ without leaving a
+ hole. */
+# define FALLOC_FL_ZERO_RANGE 16 /* Convert a range of a
+ file to zeros. */
/* File handle structure. */
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index f5b02dd462..1331e1b82c 100644
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -101,6 +101,8 @@
Also incoming ICMP frag_needed notifications will be ignored on
this socket to prevent accepting spoofed ones. */
#define IP_PMTUDISC_INTERFACE 4
+/* Like IP_PMTUDISC_INTERFACE but allow packets to be fragmented. */
+#define IP_PMTUDISC_OMIT 5
#define IP_MULTICAST_IF 32
#define IP_MULTICAST_TTL 33
@@ -214,6 +216,8 @@ struct in_pktinfo
#define IPV6_PMTUDISC_WANT 1 /* Use per route hints. */
#define IPV6_PMTUDISC_DO 2 /* Always DF. */
#define IPV6_PMTUDISC_PROBE 3 /* Ignore dst pmtu. */
+#define IPV6_PMTUDISC_INTERFACE 4 /* See IP_PMTUDISC_INTERFACE. */
+#define IPV6_PMTUDISC_OMIT 5 /* See IP_PMTUDISC_OMIT. */
/* Socket level values for IPv6. */
#define SOL_IPV6 41