fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 04:08:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: collect maximum max-bitrate in nm_wifi_ap_update_from_properties()

Browse source
This commit is contained in:
Thomas Haller 2017-03-09 22:11:55 +01:00 • committed by Beniamino Galvani
parent b0016d47f1
commit 5bd7ff2ec0
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/devices/wifi/nm-wifi-ap.c
View file

@ -720,11 +720,13 @@ nm_wifi_ap_update_from_properties (NMWifiAP *ap,
const guint8 *bytes; const guint8 *bytes;
GVariant *v; GVariant *v;
gsize len; gsize len;
gsize i;
gboolean b = FALSE; gboolean b = FALSE;
const char *s; const char *s;
gint16 i16; gint16 i16;
guint16 u16; guint16 u16;
gboolean changed = FALSE; gboolean changed = FALSE;
guint32 max_rate;
g_return_val_if_fail (NM_IS_WIFI_AP (ap), FALSE); g_return_val_if_fail (NM_IS_WIFI_AP (ap), FALSE);
g_return_val_if_fail (properties, FALSE); g_return_val_if_fail (properties, FALSE);
@ -773,32 +775,23 @@ nm_wifi_ap_update_from_properties (NMWifiAP *ap,
g_variant_unref (v); g_variant_unref (v);
} }
max_rate = 0;
v = g_variant_lookup_value (properties, "Rates", G_VARIANT_TYPE ("au")); v = g_variant_lookup_value (properties, "Rates", G_VARIANT_TYPE ("au"));
if (v) { if (v) {
const guint32 *rates = g_variant_get_fixed_array (v, &len, sizeof (guint32)); const guint32 *rates = g_variant_get_fixed_array (v, &len, sizeof (guint32));
guint32 maxrate = 0;
int i;
/* Find the max AP rate */ for (i = 0; i < len; i++)
for (i = 0; i < len; i++) { max_rate = NM_MAX (max_rate, rates[i]);
if (rates[i] > maxrate)
maxrate = rates[i];
}
if (maxrate)
changed |= nm_wifi_ap_set_max_bitrate (ap, maxrate / 1000);
g_variant_unref (v); g_variant_unref (v);
} }
v = g_variant_lookup_value (properties, "IEs", G_VARIANT_TYPE_BYTESTRING); v = g_variant_lookup_value (properties, "IEs", G_VARIANT_TYPE_BYTESTRING);
if (v) { if (v) {
guint32 max_rate;
bytes = g_variant_get_fixed_array (v, &len, 1); bytes = g_variant_get_fixed_array (v, &len, 1);
max_rate = get_max_rate (bytes, len); max_rate = NM_MAX (max_rate, get_max_rate (bytes, len));
if (max_rate > 0)
changed |= nm_wifi_ap_set_max_bitrate (ap, max_rate / 1000);
g_variant_unref (v); g_variant_unref (v);
} }
if (max_rate)
changed |= nm_wifi_ap_set_max_bitrate (ap, max_rate / 1000);
v = g_variant_lookup_value (properties, "WPA", G_VARIANT_TYPE_VARDICT); v = g_variant_lookup_value (properties, "WPA", G_VARIANT_TYPE_VARDICT);
if (v) { if (v) {