summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--inet/netinet/in.h2
-rw-r--r--sysdeps/unix/sysv/linux/bits/in.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cb37c5d165..f4e3d67c11 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 f541c5809d..460745ebb3 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 887719fb15..fc0faf62ce 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. */