mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2025-08-06 21:47:22 +02:00
Compare commits
No commits in common. "master" and "3.9" have entirely different histories.
@ -95,8 +95,6 @@ static const struct diagnostic_dict_mapping diagnostic_mapping[] = {
|
|||||||
{ "Frequency", 'u' },
|
{ "Frequency", 'u' },
|
||||||
{ "Channel", 'q' },
|
{ "Channel", 'q' },
|
||||||
{ "Security", 's' },
|
{ "Security", 's' },
|
||||||
{ "InactiveTime", 'u', "ms" },
|
|
||||||
{ "ConnectedTime", 'u', "s" },
|
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -110,14 +110,6 @@ bool diagnostic_info_to_dict(const struct diagnostic_station_info *info,
|
|||||||
dbus_append_dict_basic(builder, "ExpectedThroughput", 'u',
|
dbus_append_dict_basic(builder, "ExpectedThroughput", 'u',
|
||||||
&info->expected_throughput);
|
&info->expected_throughput);
|
||||||
|
|
||||||
if (info->have_inactive_time)
|
|
||||||
dbus_append_dict_basic(builder, "InactiveTime", 'u',
|
|
||||||
&info->inactive_time);
|
|
||||||
|
|
||||||
if (info->have_connected_time)
|
|
||||||
dbus_append_dict_basic(builder, "ConnectedTime", 'u',
|
|
||||||
&info->connected_time);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,9 +43,6 @@ struct diagnostic_station_info {
|
|||||||
|
|
||||||
uint32_t expected_throughput;
|
uint32_t expected_throughput;
|
||||||
|
|
||||||
uint32_t inactive_time;
|
|
||||||
uint32_t connected_time;
|
|
||||||
|
|
||||||
bool have_cur_rssi : 1;
|
bool have_cur_rssi : 1;
|
||||||
bool have_avg_rssi : 1;
|
bool have_avg_rssi : 1;
|
||||||
bool have_rx_mcs : 1;
|
bool have_rx_mcs : 1;
|
||||||
@ -53,8 +50,6 @@ struct diagnostic_station_info {
|
|||||||
bool have_rx_bitrate : 1;
|
bool have_rx_bitrate : 1;
|
||||||
bool have_tx_bitrate : 1;
|
bool have_tx_bitrate : 1;
|
||||||
bool have_expected_throughput : 1;
|
bool have_expected_throughput : 1;
|
||||||
bool have_inactive_time : 1;
|
|
||||||
bool have_connected_time : 1;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
bool diagnostic_info_to_dict(const struct diagnostic_station_info *info,
|
bool diagnostic_info_to_dict(const struct diagnostic_station_info *info,
|
||||||
|
17
src/netdev.c
17
src/netdev.c
@ -637,6 +637,7 @@ static bool netdev_parse_sta_info(struct l_genl_attr *attr,
|
|||||||
info->have_tx_mcs = true;
|
info->have_tx_mcs = true;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case NL80211_STA_INFO_EXPECTED_THROUGHPUT:
|
case NL80211_STA_INFO_EXPECTED_THROUGHPUT:
|
||||||
if (len != 4)
|
if (len != 4)
|
||||||
return false;
|
return false;
|
||||||
@ -644,22 +645,6 @@ static bool netdev_parse_sta_info(struct l_genl_attr *attr,
|
|||||||
info->expected_throughput = l_get_u32(data);
|
info->expected_throughput = l_get_u32(data);
|
||||||
info->have_expected_throughput = true;
|
info->have_expected_throughput = true;
|
||||||
|
|
||||||
break;
|
|
||||||
case NL80211_STA_INFO_INACTIVE_TIME:
|
|
||||||
if (len != 4)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
info->inactive_time = l_get_u32(data);
|
|
||||||
info->have_inactive_time = true;
|
|
||||||
|
|
||||||
break;
|
|
||||||
case NL80211_STA_INFO_CONNECTED_TIME:
|
|
||||||
if (len != 4)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
info->connected_time = l_get_u32(data);
|
|
||||||
info->have_connected_time = true;
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user