about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-08-03 12:13:16 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-08-03 12:13:16 +0000
commite7516580ecabdc09861b5e38cec25db91331c3bc (patch)
treec0797bef86f4110a1d155fc24eb59fd277fc4169
parentacaff9b658720e4c887f4e44e6f28962d6f372d3 (diff)
downloadglibc-e7516580ecabdc09861b5e38cec25db91331c3bc.tar.gz
glibc-e7516580ecabdc09861b5e38cec25db91331c3bc.tar.xz
glibc-e7516580ecabdc09861b5e38cec25db91331c3bc.zip
Define UDP_ENCAP_* from Linux 4.7 in netinet/udp.h.
This patch adds the new UDP_ENCAP_GTP0 and UDP_ENCAP_GTP1U from Linux
4.7 to sysdeps/gnu/netinet/udp.h.

Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).

	* sysdeps/gnu/netinet/udp.h (UDP_ENCAP_GTP0): New macro.
	(UDP_ENCAP_GTP1U): Likewise.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/gnu/netinet/udp.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 63673cfd32..d34d672860 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-08-03  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/gnu/netinet/udp.h (UDP_ENCAP_GTP0): New macro.
+	(UDP_ENCAP_GTP1U): Likewise.
+
 	* sysdeps/unix/sysv/linux/bits/socket.h (PF_QIPCRTR): New macro.
 	(PF_MAX): Update value.
 	(AF_QIPCRTR): New macro.
diff --git a/sysdeps/gnu/netinet/udp.h b/sysdeps/gnu/netinet/udp.h
index bcc3213dc2..e3d4492c8a 100644
--- a/sysdeps/gnu/netinet/udp.h
+++ b/sysdeps/gnu/netinet/udp.h
@@ -87,6 +87,8 @@ struct udphdr
 #define UDP_ENCAP_ESPINUDP_NON_IKE 1	/* draft-ietf-ipsec-nat-t-ike-00/01 */
 #define UDP_ENCAP_ESPINUDP	2	/* draft-ietf-ipsec-udp-encaps-06 */
 #define UDP_ENCAP_L2TPINUDP	3	/* rfc2661 */
+#define UDP_ENCAP_GTP0		4	/* GSM TS 09.60 */
+#define UDP_ENCAP_GTP1U		5	/* 3GPP TS 29.060 */
 
 #define SOL_UDP            17      /* sockopt level for UDP */