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
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
commit 5146b73d72ced9bab125e986aa99ef5fe2f88475
|
|
Author: Joseph Myers <joseph@codesourcery.com>
|
|
Date: Mon Dec 20 15:38:32 2021 +0000
|
|
|
|
Add ARPHRD_CAN, ARPHRD_MCTP to net/if_arp.h
|
|
|
|
Add the constant ARPHRD_MCTP, from Linux 5.15, to net/if_arp.h, along
|
|
with ARPHRD_CAN which was added to Linux in version 2.6.25 (commit
|
|
cd05acfe65ed2cf2db683fa9a6adb8d35635263b, "[CAN]: Allocate protocol
|
|
numbers for PF_CAN") but apparently missed for glibc at the time.
|
|
|
|
Tested for x86_64.
|
|
|
|
(cherry picked from commit a94d9659cd69dbc70d3494b1cbbbb5a1551675c5)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h
|
|
index 2a8933cde7cf236d..42910b776660def1 100644
|
|
--- a/sysdeps/unix/sysv/linux/net/if_arp.h
|
|
+++ b/sysdeps/unix/sysv/linux/net/if_arp.h
|
|
@@ -95,6 +95,8 @@ struct arphdr
|
|
#define ARPHRD_ROSE 270
|
|
#define ARPHRD_X25 271 /* CCITT X.25. */
|
|
#define ARPHRD_HWX25 272 /* Boards with X.25 in firmware. */
|
|
+#define ARPHRD_CAN 280 /* Controller Area Network. */
|
|
+#define ARPHRD_MCTP 290
|
|
#define ARPHRD_PPP 512
|
|
#define ARPHRD_CISCO 513 /* Cisco HDLC. */
|
|
#define ARPHRD_HDLC ARPHRD_CISCO
|