From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id A4BA93858430; Tue, 3 May 2022 09:38:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A4BA93858430 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] Add ARPHRD_CAN, ARPHRD_MCTP to net/if_arp.h X-Act-Checkin: glibc X-Git-Author: Joseph Myers X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: fd5dbfd1cd98cb2f12f9e9f7004a4d25ab0c977f X-Git-Newrev: 5146b73d72ced9bab125e986aa99ef5fe2f88475 Message-Id: <20220503093824.A4BA93858430@sourceware.org> Date: Tue, 3 May 2022 09:38:24 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2022 09:38:24 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5146b73d72ced9bab125e986aa99ef5fe2f88475 commit 5146b73d72ced9bab125e986aa99ef5fe2f88475 Author: Joseph Myers 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: --- sysdeps/unix/sysv/linux/net/if_arp.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h index 2a8933cde7..42910b7766 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