From 43a6a52efe2005a49714f423331432cd833ec4df Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 16 Feb 2016 19:46:28 +0100
Subject: sd-lldp: move ETHERTYPE_LLDP to missing.h

After all, most ETHERTYPE variables are defined in the system headers, hence
define these where we defined all other fill-ins for system headers.
---
 src/basic/missing.h           | 5 +++++
 src/libsystemd-network/lldp.h | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/basic/missing.h b/src/basic/missing.h
index f3d32362bd..44684e2dc8 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -31,6 +31,7 @@
 #include <linux/neighbour.h>
 #include <linux/oom.h>
 #include <linux/rtnetlink.h>
+#include <net/ethernet.h>
 #include <stdlib.h>
 #include <sys/resource.h>
 #include <sys/syscall.h>
@@ -1168,4 +1169,8 @@ static inline key_serial_t request_key(const char *type, const char *description
 #define char16_t uint16_t
 #endif
 
+#ifndef ETHERTYPE_LLDP
+#define ETHERTYPE_LLDP 0x88cc
+#endif
+
 #endif
diff --git a/src/libsystemd-network/lldp.h b/src/libsystemd-network/lldp.h
index d2c7164633..f881f490b4 100644
--- a/src/libsystemd-network/lldp.h
+++ b/src/libsystemd-network/lldp.h
@@ -22,8 +22,6 @@
 
 #define LLDP_MULTICAST_ADDR     { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e }
 
-#define ETHERTYPE_LLDP          0x88cc
-
 /* IEEE 802.3AB Clause 9: TLV Types */
 typedef enum LLDPTypes {
         LLDP_TYPE_END                  =   0,
-- 
cgit v1.2.3-54-g00ecf