Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 10:39:23 +01:00
Code Releases Activity

station: refactor to use diagnostic_info_to_dict

Browse Source
This commit is contained in:
James Prestwood 2021-01-22 12:38:44 -08:00 committed by Denis Kenzior
parent b5d927ec3b
commit 158dc40340
1 changed files with 1 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/station.c
View File

@ -3467,7 +3467,6 @@ static void station_get_diagnostic_cb(
struct station *station = user_data; struct station *station = user_data;
struct l_dbus_message *reply; struct l_dbus_message *reply;
struct l_dbus_message_builder *builder; struct l_dbus_message_builder *builder;
int16_t rssi;
if (!info) { if (!info) {
reply = dbus_error_aborted(station->get_station_pending); reply = dbus_error_aborted(station->get_station_pending);
@ -3476,8 +3475,6 @@ static void station_get_diagnostic_cb(
reply = l_dbus_message_new_method_return(station->get_station_pending); reply = l_dbus_message_new_method_return(station->get_station_pending);
rssi = (int16_t)info->cur_rssi;
builder = l_dbus_message_builder_new(reply); builder = l_dbus_message_builder_new(reply);
l_dbus_message_builder_enter_array(builder, "{sv}"); l_dbus_message_builder_enter_array(builder, "{sv}");
@ -3485,70 +3482,7 @@ static void station_get_diagnostic_cb(
dbus_append_dict_basic(builder, "ConnectedBss", 's', dbus_append_dict_basic(builder, "ConnectedBss", 's',
util_address_to_string(info->addr)); util_address_to_string(info->addr));
if (info->have_cur_rssi) diagnostic_info_to_dict(info, builder);
dbus_append_dict_basic(builder, "RSSI", 'n', &rssi);
if (info->have_rx_mcs) {
switch (info->rx_mcs_type) {
case DIAGNOSTIC_MCS_TYPE_HT:
dbus_append_dict_basic(builder, "RxMode", 's',
"802.11n");
dbus_append_dict_basic(builder, "RxMCS", 'y',
&info->rx_mcs);
break;
case DIAGNOSTIC_MCS_TYPE_VHT:
dbus_append_dict_basic(builder, "RxMode", 's',
"802.11ac");
dbus_append_dict_basic(builder, "RxMCS", 'y',
&info->rx_mcs);
break;
case DIAGNOSTIC_MCS_TYPE_HE:
dbus_append_dict_basic(builder, "RxMode", 's',
"802.11ax");
dbus_append_dict_basic(builder, "RxMCS", 'y',
&info->rx_mcs);
break;
default:
break;
}
}
if (info->have_tx_mcs) {
switch (info->tx_mcs_type) {
case DIAGNOSTIC_MCS_TYPE_HT:
dbus_append_dict_basic(builder, "TxMode", 's',
"802.11n");
dbus_append_dict_basic(builder, "TxMCS", 'y',
&info->tx_mcs);
break;
case DIAGNOSTIC_MCS_TYPE_VHT:
dbus_append_dict_basic(builder, "TxMode", 's',
"802.11ac");
dbus_append_dict_basic(builder, "TxMCS", 'y',
&info->tx_mcs);
break;
case DIAGNOSTIC_MCS_TYPE_HE:
dbus_append_dict_basic(builder, "TxMode", 's',
"802.11ax");
dbus_append_dict_basic(builder, "TxMCS", 'y',
&info->tx_mcs);
break;
default:
break;
}
}
if (info->have_tx_bitrate)
dbus_append_dict_basic(builder, "TxBitrate", 'u',
&info->tx_bitrate);
if (info->have_rx_bitrate)
dbus_append_dict_basic(builder, "RxBitrate", 'u',
&info->rx_bitrate);
if (info->have_expected_throughput)
dbus_append_dict_basic(builder, "ExpectedThroughput", 'u',
&info->expected_throughput);
l_dbus_message_builder_leave_array(builder); l_dbus_message_builder_leave_array(builder);
l_dbus_message_builder_finalize(builder); l_dbus_message_builder_finalize(builder);