]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-lldp: move ETHERTYPE_LLDP to missing.h
authorLennart Poettering <lennart@poettering.net>
Tue, 16 Feb 2016 18:46:28 +0000 (19:46 +0100)
committerLennart Poettering <lennart@poettering.net>
Sat, 20 Feb 2016 21:42:29 +0000 (22:42 +0100)
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
src/libsystemd-network/lldp.h

index f3d32362bd56674cc2a12fb1688aec997b172d2f..44684e2dc82e8d59bd544147d29d65e8a7d0b74d 100644 (file)
@@ -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
index d2c71646333784c3a054f0cb6b07dd47093f5587..f881f490b4dda96ef224a010a2678cdefaf4a24c 100644 (file)
@@ -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,