public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Florian Weimer <fw@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/release/2.34/master] Add ARPHRD_CAN, ARPHRD_MCTP to net/if_arp.h
Date: Tue,  3 May 2022 09:38:24 +0000 (GMT)	[thread overview]
Message-ID: <20220503093824.A4BA93858430@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5146b73d72ced9bab125e986aa99ef5fe2f88475

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:
---
 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


                 reply	other threads:[~2022-05-03  9:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220503093824.A4BA93858430@sourceware.org \
    --to=fw@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).