Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-05-05 08:37:23 +02:00
Code Releases Activity

wiphy: Use new data rate estimation utilities

Browse Source
This commit is contained in:
Denis Kenzior 2021-06-03 22:16:41 -05:00
parent 6111706911
commit 43692cb377
1 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/wiphy.c
View File

@ -681,7 +681,25 @@ int wiphy_estimate_data_rate(struct wiphy *wiphy,
const void *supported_rates = NULL; const void *supported_rates = NULL;
const void *ext_supported_rates = NULL; const void *ext_supported_rates = NULL;
const void *vht_capabilities = NULL; const void *vht_capabilities = NULL;
const void *vht_operation = NULL;
const void *ht_capabilities = NULL; const void *ht_capabilities = NULL;
const void *ht_operation = NULL;
const struct band *bandp;
enum scan_band band;
if (scan_freq_to_channel(bss->frequency, &band) == 0)
return -ENOTSUP;
switch (band) {
case SCAN_BAND_2_4_GHZ:
bandp = wiphy->band_2g;
break;
case SCAN_BAND_5_GHZ:
bandp = wiphy->band_5g;
break;
default:
return -ENOTSUP;
}
ie_tlv_iter_init(&iter, ies, ies_len); ie_tlv_iter_init(&iter, ies, ies_len);
@ -704,22 +722,47 @@ int wiphy_estimate_data_rate(struct wiphy *wiphy,
ht_capabilities = iter.data - 2; ht_capabilities = iter.data - 2;
break; break;
case IE_TYPE_HT_OPERATION:
if (iter.len != 22)
return -EBADMSG;
ht_operation = iter.data - 2;
break;
case IE_TYPE_VHT_CAPABILITIES: case IE_TYPE_VHT_CAPABILITIES:
if (iter.len != 12) if (iter.len != 12)
return -EBADMSG; return -EBADMSG;
vht_capabilities = iter.data - 2; vht_capabilities = iter.data - 2;
break; break;
case IE_TYPE_VHT_OPERATION:
if (iter.len != 5)
return -EBADMSG;
vht_operation = iter.data - 2;
break;
default: default:
break; break;
} }
} }
return ie_parse_data_rates(supported_rates, ext_supported_rates, if (!band_estimate_vht_rx_rate(bandp, vht_capabilities, vht_operation,
ht_capabilities, ht_capabilities, ht_operation,
vht_capabilities,
bss->signal_strength / 100, bss->signal_strength / 100,
out_data_rate); out_data_rate))
return 0;
if (!band_estimate_ht_rx_rate(bandp, ht_capabilities, ht_operation,
bss->signal_strength / 100,
out_data_rate))
return 0;
if (!band_estimate_nonht_rate(bandp, supported_rates,
ext_supported_rates,
bss->signal_strength / 100,
out_data_rate))
return 0;
return -ENOTSUP;
} }
uint32_t wiphy_state_watch_add(struct wiphy *wiphy, uint32_t wiphy_state_watch_add(struct wiphy *wiphy,