Commit c94aa7ef authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: fix survey reporting

Number of channels is stored in a separate macro
in a header file and channel list is constructed
independently. The macro is used to define survey

This fixes a recent regression introduced after
adding support for 144 channel. The regression
would lead to a warning and incomplete survey data
on channel 165:

  chan info: invalid frequency 5825 (idx 38 out of bounds)

Also make sure to enforce the sizes and avoid this
kind of problem in the future.

Fixes: 4a7898fe

 ("ath10k: enable channel 144 on 5GHz band")
Signed-off-by: default avatarMichal Kazior <>
Signed-off-by: default avatarKalle Valo <>
parent 9eea5689
......@@ -45,7 +45,7 @@
#define WMI_READY_TIMEOUT (5 * HZ)
#define ATH10K_NUM_CHANS 38
#define ATH10K_NUM_CHANS 39
/* Antenna noise floor */
......@@ -6016,6 +6016,10 @@ int ath10k_mac_register(struct ath10k *ar)
ht_cap = ath10k_get_ht_cap(ar);
vht_cap = ath10k_create_vht_cap(ar);
BUILD_BUG_ON((ARRAY_SIZE(ath10k_2ghz_channels) +
ARRAY_SIZE(ath10k_5ghz_channels)) !=
if (ar->phy_capability & WHAL_WLAN_11G_CAPABILITY) {
channels = kmemdup(ath10k_2ghz_channels,
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment