Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next

[linux-beck.git] / drivers / net / wireless / ath / ath10k / wmi.c

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index ac742905331bd08aad670d9903c2c6d7b036ace7..23eca8bc85d1268a39a72c1d5ef00abd25c9671c 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1650,11 +1650,11 @@ void ath10k_wmi_event_chan_info(struct ath10k *ar, struct sk_buff *skb)
                rx_clear_count -= ar->survey_last_rx_clear_count;
 
                survey = &ar->survey[idx];
-               survey->channel_time = WMI_CHAN_INFO_MSEC(cycle_count);
-               survey->channel_time_rx = WMI_CHAN_INFO_MSEC(rx_clear_count);
+               survey->time = WMI_CHAN_INFO_MSEC(cycle_count);
+               survey->time_rx = WMI_CHAN_INFO_MSEC(rx_clear_count);
                survey->noise = noise_floor;
-               survey->filled = SURVEY_INFO_CHANNEL_TIME |
-                                SURVEY_INFO_CHANNEL_TIME_RX |
+               survey->filled = SURVEY_INFO_TIME |
+                                SURVEY_INFO_TIME_RX |
                                 SURVEY_INFO_NOISE_DBM;
        }