Skip to content
Snippets Groups Projects
Commit ae334b69 authored by Ryan Gonzalez's avatar Ryan Gonzalez
Browse files

Fix compilation on kernel 5.14+

https://phabricator.apertis.org/T8162



Signed-off-by: default avatarRyan Gonzalez <ryan.gonzalez@collabora.com>
parent cece6feb
No related branches found
No related tags found
No related merge requests found
systemd (247.3-6+apertis2) apertis; urgency=medium
* d/p/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch:
Fix compilation on kernel 5.14+
-- Ryan Gonzalez <ryan.gonzalez@collabora.com> Thu, 13 Jan 2022 15:27:00 -0600
systemd (247.3-6+apertis1) apertis; urgency=medium
* Merge from Debian Bullseye. Remaining changes:
......
From: Chris Packham <chris.packham@alliedtelesis.co.nz>
Date: Fri, 10 Sep 2021 09:51:36 +1200
Subject: basic/linux: Sync if_arp.h with Linux 5.14
ARPHRD_MCTP was added in 5.14. Sync if_arp.h to pick up the definition
Fixes #20694
---
src/basic/linux/if_arp.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/basic/linux/if_arp.h b/src/basic/linux/if_arp.h
index c3cc5a9..4783af9 100644
--- a/src/basic/linux/if_arp.h
+++ b/src/basic/linux/if_arp.h
@@ -54,6 +54,7 @@
#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
......@@ -39,3 +39,4 @@ apertis/Reworked-kernel-install-script.patch
apertis/Remove-bashisms-from-the-entry-directory-plugin.patch
apertis/kernel-install-allow-to-create-BOOT-MACHINE_ID.patch
apertis/Fix-the-path-to-bootable-binaries-in-efi-entry.patch
apertis/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment