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
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
commit bc6fba3c8048b11c9f73db03339c97a2fec3f0cf
|
|
Author: Joseph Myers <joseph@codesourcery.com>
|
|
Date: Wed Nov 17 14:25:16 2021 +0000
|
|
|
|
Add PF_MCTP, AF_MCTP from Linux 5.15 to bits/socket.h
|
|
|
|
Linux 5.15 adds a new address / protocol family PF_MCTP / AF_MCTP; add
|
|
these constants to bits/socket.h.
|
|
|
|
Tested for x86_64.
|
|
|
|
(cherry picked from commit bdeb7a8fa9989d18dab6310753d04d908125dc1d)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
|
|
index a011a8c0959b9970..7bb9e863d7329da9 100644
|
|
--- a/sysdeps/unix/sysv/linux/bits/socket.h
|
|
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
|
|
@@ -86,7 +86,8 @@ typedef __socklen_t socklen_t;
|
|
#define PF_QIPCRTR 42 /* Qualcomm IPC Router. */
|
|
#define PF_SMC 43 /* SMC sockets. */
|
|
#define PF_XDP 44 /* XDP sockets. */
|
|
-#define PF_MAX 45 /* For now.. */
|
|
+#define PF_MCTP 45 /* Management component transport protocol. */
|
|
+#define PF_MAX 46 /* For now.. */
|
|
|
|
/* Address families. */
|
|
#define AF_UNSPEC PF_UNSPEC
|
|
@@ -137,6 +138,7 @@ typedef __socklen_t socklen_t;
|
|
#define AF_QIPCRTR PF_QIPCRTR
|
|
#define AF_SMC PF_SMC
|
|
#define AF_XDP PF_XDP
|
|
+#define AF_MCTP PF_MCTP
|
|
#define AF_MAX PF_MAX
|
|
|
|
/* Socket level values. Others are defined in the appropriate headers.
|