@@ -7827,12 +7827,6 @@ static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,
mutex_lock(&ah->conf_mutex);
- ar = ath12k_ah_to_ar(ah, 0);
-
- ar_survey = &ar->survey[idx];
-
- mutex_lock(&ar->conf_mutex);
-
sband = hw->wiphy->bands[NL80211_BAND_2GHZ];
if (sband && idx >= sband->n_channels) {
idx -= sband->n_channels;
@@ -7847,6 +7841,21 @@ static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,
goto exit;
}
+ ar = ath12k_mac_get_ar_by_chan(hw, &sband->channels[idx]);
+ if (!ar) {
+ if (sband->channels[idx].flags & IEEE80211_CHAN_DISABLED) {
+ ret = 0;
+ memset(survey, 0, sizeof(*survey));
+ goto exit;
+ }
+ ret = -ENOENT;
+ goto exit;
+ }
+
+ ar_survey = &ar->survey[idx];
+
+ mutex_lock(&ar->conf_mutex);
+
ath12k_mac_update_bss_chan_survey(ar, &sband->channels[idx]);
spin_lock_bh(&ar->data_lock);
@@ -7858,8 +7867,8 @@ static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,
if (ar->rx_channel == survey->channel)
survey->filled |= SURVEY_INFO_IN_USE;
-exit:
mutex_unlock(&ar->conf_mutex);
+exit:
mutex_unlock(&ah->conf_mutex);
return ret;
The radio for which the survey info needs to be collected depends on the channel idx which could be based on the band. Use the idx to identify the appropriate sband since multiple bands could be combined for single wiphy case. Also use the channel idx and sband to identify the corresponding radio on which the survey results needs to be populated. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Signed-off-by: Sriram R <quic_srirrama@quicinc.com> --- drivers/net/wireless/ath/ath12k/mac.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)