From cc9a25f721918fb9fb219082f11ab04fb78c9891 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@codeconstruct.com.au>
Date: Fri, 1 Aug 2025 16:39:38 +0800
Subject: [PATCH 1/2] mctp: don't include linux/mctp.h directly

Commit e35f4a5 ("mctpd: avoid bitfield & implicit enum values in wire
format") introduced a #include <linux/mctp.h> for mctp_eid_t. However,
we want the ability to fall-back to the in-tree definitions, so use the
internal mctp.h instead. This will use mctp.h if available.

Fixes: https://github.com/CodeConstruct/mctp/issues/103
Fixes: e35f4a5 ("mctpd: avoid bitfield & implicit enum values in wire format")
Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
---
 src/mctp-control-spec.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mctp-control-spec.h b/src/mctp-control-spec.h
index 6543c32..f691c5f 100644
--- a/src/mctp-control-spec.h
+++ b/src/mctp-control-spec.h
@@ -5,7 +5,8 @@
 
 #include <assert.h>
 #include <stdint.h>
-#include <linux/mctp.h>
+
+#include "mctp.h"
 
 /*
  * Helper structs and functions for MCTP control messages.

From 36e5ecac2264701f1582413147ed65a10d725820 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@codeconstruct.com.au>
Date: Tue, 5 Aug 2025 09:21:55 +0800
Subject: [PATCH 2/2] netlink: Include linux/if.h

We use IFNAMSIZ, so include if.h.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
---
 src/mctp-netlink.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mctp-netlink.h b/src/mctp-netlink.h
index 64a5183..a8120f5 100644
--- a/src/mctp-netlink.h
+++ b/src/mctp-netlink.h
@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
+#include <linux/if.h>
 #include <linux/rtnetlink.h>
 
 #include "mctp.h"