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