diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-02-16 19:46:28 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-02-20 22:42:29 +0100 |
commit | 43a6a52efe2005a49714f423331432cd833ec4df (patch) | |
tree | 982eb23d8b56ce39672aab7a9458720cd42a52ea | |
parent | bd8650e9b8862fd42deb7e1c0b64e5bd63f2daf0 (diff) |
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.
-rw-r--r-- | src/basic/missing.h | 5 | ||||
-rw-r--r-- | src/libsystemd-network/lldp.h | 2 |
2 files changed, 5 insertions, 2 deletions
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, |