diff options
Diffstat (limited to 'src/core/supplicant/nm-supplicant-interface.c')
| -rw-r--r-- | src/core/supplicant/nm-supplicant-interface.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c index 18525724..eb7a40a5 100644 --- a/src/core/supplicant/nm-supplicant-interface.c +++ b/src/core/supplicant/nm-supplicant-interface.c @@ -689,7 +689,7 @@ _bss_info_properties_changed(NMSupplicantInterface *self, v_v = nm_g_variant_lookup_value(properties, "SSID", G_VARIANT_TYPE_BYTESTRING); if (v_v) { arr_data = g_variant_get_fixed_array(v_v, &arr_len, 1); - arr_len = MIN(32, arr_len); + arr_len = NM_MIN(32u, arr_len); /* Stupid ieee80211 layer uses <hidden> */ if (arr_data && arr_len @@ -765,9 +765,15 @@ _bss_info_properties_changed(NMSupplicantInterface *self, gboolean p_owe_transition_mode; gboolean p_metered; guint32 rate; + guint32 bandwidth; arr_data = g_variant_get_fixed_array(v_v, &arr_len, 1); - nm_wifi_utils_parse_ies(arr_data, arr_len, &rate, &p_metered, &p_owe_transition_mode); + nm_wifi_utils_parse_ies(arr_data, + arr_len, + &rate, + &bandwidth, + &p_metered, + &p_owe_transition_mode); p_max_rate = NM_MAX(p_max_rate, rate); p_max_rate_has = TRUE; g_variant_unref(v_v); @@ -777,7 +783,8 @@ _bss_info_properties_changed(NMSupplicantInterface *self, else bss_info->rsn_flags &= ~NM_802_11_AP_SEC_KEY_MGMT_OWE_TM; - bss_info->metered = p_metered; + bss_info->metered = p_metered; + bss_info->bandwidth = bandwidth; } if (p_max_rate_has) @@ -1373,7 +1380,7 @@ _get_capability(NMSupplicantInterfacePrivate *priv, NMSupplCapType type) case NM_SUPPL_CAP_TYPE_AP: iface_value = NM_SUPPL_CAP_MASK_GET(priv->iface_capabilities, type); value = NM_SUPPL_CAP_MASK_GET(priv->global_capabilities, type); - value = MAX(iface_value, value); + value = NM_MAX(iface_value, value); break; case NM_SUPPL_CAP_TYPE_FT: value = NM_SUPPL_CAP_MASK_GET(priv->global_capabilities, type); |