Compare commits
No commits in common. "a4f4a4e44100025cfbe01b042db386e0e933c627" and "08c588d18b1e337f856e6541f3f711be48718279" have entirely different histories.
a4f4a4e441
...
08c588d18b
|
@ -99,6 +99,7 @@
|
|||
<citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>sd_bus_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>sd_bus_message_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>sd_bus_slot_new_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>sd_bus_call_method_async</refentrytitle><manvolnum>3</manvolnum></citerefentry>
|
||||
</para>
|
||||
</refsect1>
|
||||
|
|
|
@ -149,9 +149,6 @@ typedef struct LinkInfo {
|
|||
/* vxlan info */
|
||||
VxLanInfo vxlan_info;
|
||||
|
||||
/* vlan info */
|
||||
uint16_t vlan_id;
|
||||
|
||||
/* ethtool info */
|
||||
int autonegotiation;
|
||||
uint64_t speed;
|
||||
|
@ -243,8 +240,7 @@ static int decode_netdev(sd_netlink_message *m, LinkInfo *info) {
|
|||
|
||||
(void) sd_netlink_message_read_u32(m, IFLA_VXLAN_LINK, &info->vxlan_info.link);
|
||||
(void) sd_netlink_message_read_u16(m, IFLA_VXLAN_PORT, &info->vxlan_info.dest_port);
|
||||
} else if (streq(received_kind, "vlan"))
|
||||
(void) sd_netlink_message_read_u16(m, IFLA_VLAN_ID, &info->vlan_id);
|
||||
}
|
||||
|
||||
strncpy(info->netdev_kind, received_kind, IFNAMSIZ);
|
||||
|
||||
|
@ -1443,13 +1439,6 @@ static int link_status_one(
|
|||
if (r < 0)
|
||||
return table_log_add_error(r);
|
||||
}
|
||||
} else if (streq_ptr(info->netdev_kind, "vlan") && info->vlan_id > 0) {
|
||||
r = table_add_many(table,
|
||||
TABLE_EMPTY,
|
||||
TABLE_STRING, "VLan Id:",
|
||||
TABLE_UINT16, info->vlan_id);
|
||||
if (r < 0)
|
||||
return table_log_add_error(r);
|
||||
}
|
||||
|
||||
if (info->has_wlan_link_info) {
|
||||
|
|
Loading…
Reference in New Issue