This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.22-202-g04d9a38


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  04d9a38bafddb92ab79bc0015533689e15848522 (commit)
      from  5be255c28b24944b530bb8f91e6bde2e66992c2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=04d9a38bafddb92ab79bc0015533689e15848522

commit 04d9a38bafddb92ab79bc0015533689e15848522
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Tue Sep 1 13:47:25 2015 +0000

    Add netinet/in.h values from Linux 4.2.
    
    This patch adds new constants from Linux 4.2 to netinet/in.h:
    IPPROTO_MPLS and IP_BIND_ADDRESS_NO_PORT (both in
    include/uapi/linux/in.h in Linux; one directly in netinet/in.h, one in
    bits/in.h in glibc).
    
    Tested for x86_64 (testsuite, and that installed stripped shared
    libraries are unchanged by the patch).
    
    	* inet/netinet/in.h (IPPROTO_MPLS): New enum value and macro.
    	* sysdeps/unix/sysv/linux/bits/in.h (IP_BIND_ADDRESS_NO_PORT): New
    	macro.

diff --git a/ChangeLog b/ChangeLog
index cb37c5d..f4e3d67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-09-01  Joseph Myers  <joseph@codesourcery.com>
 
+	* inet/netinet/in.h (IPPROTO_MPLS): New enum value and macro.
+	* sysdeps/unix/sysv/linux/bits/in.h (IP_BIND_ADDRESS_NO_PORT): New
+	macro.
+
 	* sysdeps/gnu/netinet/tcp.h (TCP_NOTSENT_LOWAT): New macro.
 	(TCP_CC_INFO): Likewise.
 	(TCP_SAVE_SYN): Likewise.
diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index f541c58..460745e 100644
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -85,6 +85,8 @@ enum
 #define IPPROTO_SCTP		IPPROTO_SCTP
     IPPROTO_UDPLITE = 136, /* UDP-Lite protocol.  */
 #define IPPROTO_UDPLITE		IPPROTO_UDPLITE
+    IPPROTO_MPLS = 137,    /* MPLS in IP.  */
+#define IPPROTO_MPLS		IPPROTO_MPLS
     IPPROTO_RAW = 255,	   /* Raw IP packets.  */
 #define IPPROTO_RAW		IPPROTO_RAW
     IPPROTO_MAX
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index 887719f..fc0faf6 100644
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -92,6 +92,7 @@
 #define IP_MINTTL       21
 #define IP_NODEFRAG     22
 #define IP_CHECKSUM     23
+#define IP_BIND_ADDRESS_NO_PORT 24
 
 /* IP_MTU_DISCOVER arguments.  */
 #define IP_PMTUDISC_DONT   0	/* Never send DF frames.  */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                         |    4 ++++
 inet/netinet/in.h                 |    2 ++
 sysdeps/unix/sysv/linux/bits/in.h |    1 +
 3 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]