329e925ee9
Upstream commit: 91c2e6c3db44297bf4cb3a2e3c40236c5b6a0b23 - dlfcn: Implement the RTLD_DI_PHDR request type for dlinfo - manual: Document the dlinfo function - x86: Fix fallback for wcsncmp_avx2 in strcmp-avx2.S [BZ #28896] - x86: Fix bug in strncmp-evex and strncmp-avx2 [BZ #28895] - x86: Set .text section in memset-vec-unaligned-erms - x86-64: Optimize bzero - x86: Remove SSSE3 instruction for broadcast in memset.S (SSE2 Only) - x86: Improve vec generation in memset-vec-unaligned-erms.S - x86-64: Fix strcmp-evex.S - x86-64: Fix strcmp-avx2.S - x86: Optimize strcmp-evex.S - x86: Optimize strcmp-avx2.S - manual: Clarify that abbreviations of long options are allowed - Add HWCAP2_AFP, HWCAP2_RPRES from Linux 5.17 to AArch64 bits/hwcap.h - aarch64: Add HWCAP2_ECV from Linux 5.16 - Add SOL_MPTCP, SOL_MCTP from Linux 5.16 to bits/socket.h - Update kernel version to 5.17 in tst-mman-consts.py - Update kernel version to 5.16 in tst-mman-consts.py - Update syscall lists for Linux 5.17 - Add ARPHRD_CAN, ARPHRD_MCTP to net/if_arp.h - Update kernel version to 5.15 in tst-mman-consts.py - Add PF_MCTP, AF_MCTP from Linux 5.15 to bits/socket.h
27 lines
909 B
Diff
27 lines
909 B
Diff
commit f858bc309315a03ff6b1a048f59405c159d23430
|
|
Author: Joseph Myers <joseph@codesourcery.com>
|
|
Date: Mon Feb 21 22:49:36 2022 +0000
|
|
|
|
Add SOL_MPTCP, SOL_MCTP from Linux 5.16 to bits/socket.h
|
|
|
|
Linux 5.16 adds constants SOL_MPTCP and SOL_MCTP to the getsockopt /
|
|
setsockopt levels; add these constants to bits/socket.h.
|
|
|
|
Tested for x86_64.
|
|
|
|
(cherry picked from commit fdc1ae67fef27eea1445bab4bdfe2f0fb3bc7aa1)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
|
|
index 7bb9e863d7329da9..c81fab840918924e 100644
|
|
--- a/sysdeps/unix/sysv/linux/bits/socket.h
|
|
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
|
|
@@ -169,6 +169,8 @@ typedef __socklen_t socklen_t;
|
|
#define SOL_KCM 281
|
|
#define SOL_TLS 282
|
|
#define SOL_XDP 283
|
|
+#define SOL_MPTCP 284
|
|
+#define SOL_MCTP 285
|
|
|
|
/* Maximum queue length specifiable by listen. */
|
|
#define SOMAXCONN 4096
|