mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-12-22 13:02:44 +01:00
ap: select rates from hardware capabilities
Rather than a list of static rates, choose what the hardware advertises. For the case of CCK rates only include rates 11mbps or lower.
This commit is contained in:
parent
c6792a4bcc
commit
9d003ae585
26
src/ap.c
26
src/ap.c
@ -3438,6 +3438,9 @@ struct ap_state *ap_start(struct netdev *netdev, struct l_settings *config,
|
|||||||
uint64_t wdev_id = netdev_get_wdev_id(netdev);
|
uint64_t wdev_id = netdev_get_wdev_id(netdev);
|
||||||
int err;
|
int err;
|
||||||
bool cck_rates = true;
|
bool cck_rates = true;
|
||||||
|
const uint8_t *rates;
|
||||||
|
unsigned int num_rates;
|
||||||
|
unsigned int i;
|
||||||
|
|
||||||
if (L_WARN_ON(!config)) {
|
if (L_WARN_ON(!config)) {
|
||||||
if (err_out)
|
if (err_out)
|
||||||
@ -3463,22 +3466,17 @@ struct ap_state *ap_start(struct netdev *netdev, struct l_settings *config,
|
|||||||
|
|
||||||
wsc_uuid_from_addr(netdev_get_address(netdev), ap->wsc_uuid_r);
|
wsc_uuid_from_addr(netdev_get_address(netdev), ap->wsc_uuid_r);
|
||||||
|
|
||||||
|
rates = wiphy_get_supported_rates(wiphy, ap->band, &num_rates);
|
||||||
|
if (!rates)
|
||||||
|
goto error;
|
||||||
|
|
||||||
ap->rates = l_uintset_new(200);
|
ap->rates = l_uintset_new(200);
|
||||||
|
|
||||||
/* TODO: Pick from actual supported rates */
|
for (i = 0; i < num_rates; i++) {
|
||||||
if (!cck_rates) {
|
if (cck_rates && !L_IN_SET(rates[i], 2, 4, 11, 22))
|
||||||
l_uintset_put(ap->rates, 12); /* 6 Mbps*/
|
continue;
|
||||||
l_uintset_put(ap->rates, 18); /* 9 Mbps*/
|
|
||||||
l_uintset_put(ap->rates, 24); /* 12 Mbps*/
|
l_uintset_put(ap->rates, rates[i]);
|
||||||
l_uintset_put(ap->rates, 36); /* 18 Mbps*/
|
|
||||||
l_uintset_put(ap->rates, 48); /* 24 Mbps*/
|
|
||||||
l_uintset_put(ap->rates, 72); /* 36 Mbps*/
|
|
||||||
l_uintset_put(ap->rates, 96); /* 48 Mbps*/
|
|
||||||
l_uintset_put(ap->rates, 108); /* 54 Mbps*/
|
|
||||||
} else {
|
|
||||||
l_uintset_put(ap->rates, 2); /* 1 Mbps*/
|
|
||||||
l_uintset_put(ap->rates, 11); /* 5.5 Mbps*/
|
|
||||||
l_uintset_put(ap->rates, 22); /* 11 Mbps*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!frame_watch_add(wdev_id, 0, 0x0000 |
|
if (!frame_watch_add(wdev_id, 0, 0x0000 |
|
||||||
|
Loading…
Reference in New Issue
Block a user