summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-10-08 15:57:23 +0200
committerTom Gundersen <teg@jklm.no>2015-10-08 15:57:23 +0200
commit8f3db94d9d905e6c31c1fcd0dcc6be7b78034c5c (patch)
tree32b8c2018ca80b78d31071b47f920eb727877d64
parent4d860b20a19031c94f4829172f5e312450c0ae58 (diff)
parentadf88a70f0d90ee9b7088375a0bc3a31503eb79e (diff)
Merge pull request #1497 from bengal/lldp-rename-struct
lldp: rename publicly visible structure
-rw-r--r--src/libsystemd-network/lldp-tlv.h8
-rw-r--r--src/systemd/sd-lldp.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libsystemd-network/lldp-tlv.h b/src/libsystemd-network/lldp-tlv.h
index 2d2c776be6..ca1da113d5 100644
--- a/src/libsystemd-network/lldp-tlv.h
+++ b/src/libsystemd-network/lldp-tlv.h
@@ -30,12 +30,12 @@
#include "sd-lldp.h"
-typedef struct tlv_packet tlv_packet;
-typedef struct tlv_section tlv_section;
+typedef struct sd_lldp_packet tlv_packet;
+typedef struct sd_lldp_section tlv_section;
#define LLDP_OUI_LEN 3
-struct tlv_section {
+struct sd_lldp_section {
uint16_t type;
uint16_t length;
uint8_t *oui;
@@ -54,7 +54,7 @@ struct tlv_section {
int tlv_section_new(tlv_section **ret);
void tlv_section_free(tlv_section *ret);
-struct tlv_packet {
+struct sd_lldp_packet {
unsigned n_ref;
uint16_t type;
diff --git a/src/systemd/sd-lldp.h b/src/systemd/sd-lldp.h
index 308d42c6e9..30d9dedf2c 100644
--- a/src/systemd/sd-lldp.h
+++ b/src/systemd/sd-lldp.h
@@ -35,7 +35,7 @@ enum {
};
typedef struct sd_lldp sd_lldp;
-typedef struct tlv_packet sd_lldp_packet;
+typedef struct sd_lldp_packet sd_lldp_packet;
typedef void (*sd_lldp_cb_t)(sd_lldp *lldp, int event, void *userdata);