Blame SOURCES/0001-l2_packet-Guard-ETH_P_LLDP-define.patch

78f543
From 273caec484cd37c3d96b40b1754ef4c63b530eff Mon Sep 17 00:00:00 2001
78f543
From: Scott Register <sreg@sreg.io>
78f543
Date: Tue, 22 Oct 2019 09:11:06 -0700
78f543
Subject: [PATCH] l2_packet: Guard ETH_P_LLDP define
78f543
78f543
ETH_P_LLDP is now defined in if_ether.h on new kernels. Guarding this prevents
78f543
double definition when building on 5.3 kernels.
78f543
78f543
Signed-off-by: Scott Register <sreg@sreg.io>
78f543
---
78f543
 lldp/l2_packet.h | 2 ++
78f543
 1 file changed, 2 insertions(+)
78f543
78f543
diff --git a/lldp/l2_packet.h b/lldp/l2_packet.h
78f543
index b82b894..607b8a3 100644
78f543
--- a/lldp/l2_packet.h
78f543
+++ b/lldp/l2_packet.h
78f543
@@ -37,7 +37,9 @@
78f543
 #define IP2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
78f543
 #define IPSTR "%02x:%02x:%02x:%02x:%02x:%02x"
78f543
 
78f543
+#ifndef ETH_P_LLDP
78f543
 #define ETH_P_LLDP 0x88cc
78f543
+#endif
78f543
 
78f543
 #define ETH_P_ECP	0x88b7		/* Draft 0.2 */
78f543
 #define ETH_P_ECP22	0x8940		/* Ratified standard */
78f543
-- 
78f543
2.31.1
78f543