chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-util: remove superfluous const
[elogind.git]
/
src
/
libsystemd-network
/
lldp-internal.c
diff --git
a/src/libsystemd-network/lldp-internal.c
b/src/libsystemd-network/lldp-internal.c
index f86c11e6ca02dfd6153c159ba7c1700d7687fbfe..c6a989aac1fef4cf17746ddfd880db4eea52c58f 100644
(file)
--- a/
src/libsystemd-network/lldp-internal.c
+++ b/
src/libsystemd-network/lldp-internal.c
@@
-89,6
+89,7
@@
int lldp_read_port_id(tlv_packet *tlv,
case LLDP_PORT_SUBTYPE_PORT_COMPONENT:
case LLDP_PORT_SUBTYPE_INTERFACE_ALIAS:
case LLDP_PORT_SUBTYPE_INTERFACE_NAME:
case LLDP_PORT_SUBTYPE_PORT_COMPONENT:
case LLDP_PORT_SUBTYPE_INTERFACE_ALIAS:
case LLDP_PORT_SUBTYPE_INTERFACE_NAME:
+ case LLDP_PORT_SUBTYPE_LOCALLY_ASSIGNED:
r = tlv_packet_read_string(tlv, &s, length);
if (r < 0)
r = tlv_packet_read_string(tlv, &s, length);
if (r < 0)
@@
-443,7
+444,7
@@
void lldp_neighbour_port_free(lldp_neighbour_port *p) {
int lldp_neighbour_port_new(lldp_chassis *c,
tlv_packet *tlv,
lldp_neighbour_port **ret) {
int lldp_neighbour_port_new(lldp_chassis *c,
tlv_packet *tlv,
lldp_neighbour_port **ret) {
- _cleanup_lldp_neighbour_port_free_ lldp_neighbour_port *p;
+ _cleanup_lldp_neighbour_port_free_ lldp_neighbour_port *p
= NULL
;
uint16_t length, ttl;
uint8_t *data;
uint8_t type;
uint16_t length, ttl;
uint8_t *data;
uint8_t type;
@@
-496,7
+497,7
@@
int lldp_chassis_new(tlv_packet *tlv,
Prioq *by_expiry,
Hashmap *neighbour_mib,
lldp_chassis **ret) {
Prioq *by_expiry,
Hashmap *neighbour_mib,
lldp_chassis **ret) {
- _cleanup_lldp_chassis_free_ lldp_chassis *c;
+ _cleanup_lldp_chassis_free_ lldp_chassis *c
= NULL
;
uint16_t length;
uint8_t *data;
uint8_t type;
uint16_t length;
uint8_t *data;
uint8_t type;