cfg80211: remove "channel" from survey names

All of the survey data is (currently) per channel anyway,
so having the word "channel" in the name does nothing. In
the next patch I'll introduce global data to the survey,
where the word "channel" is actually confusing.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/wireless/ath/carl9170/cmd.c b/drivers/net/wireless/ath/carl9170/cmd.c
index 39a63874b275..f2b4f537e4c1 100644
--- a/drivers/net/wireless/ath/carl9170/cmd.c
+++ b/drivers/net/wireless/ath/carl9170/cmd.c
@@ -188,12 +188,12 @@ int carl9170_collect_tally(struct ar9170 *ar)
 
                 if (ar->channel) {
                         info = &ar->survey[ar->channel->hw_value];
-                        info->channel_time = ar->tally.active;
-                        info->channel_time_busy = ar->tally.cca;
-                        info->channel_time_tx = ar->tally.tx_time;
-                        do_div(info->channel_time, 1000);
-                        do_div(info->channel_time_busy, 1000);
-                        do_div(info->channel_time_tx, 1000);
+                        info->time = ar->tally.active;
+                        info->time_busy = ar->tally.cca;
+                        info->time_tx = ar->tally.tx_time;
+                        do_div(info->time, 1000);
+                        do_div(info->time_busy, 1000);
+                        do_div(info->time_tx, 1000);
                 }
         }
         return 0;
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index ef5b6dc7b7f1..f1455a04cb62 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1690,9 +1690,9 @@ found:
                 survey->filled |= SURVEY_INFO_IN_USE;
 
         if (ar->fw.hw_counters) {
-                survey->filled |= SURVEY_INFO_CHANNEL_TIME |
-                                  SURVEY_INFO_CHANNEL_TIME_BUSY |
-                                  SURVEY_INFO_CHANNEL_TIME_TX;
+                survey->filled |= SURVEY_INFO_TIME |
+                                  SURVEY_INFO_TIME_BUSY |
+                                  SURVEY_INFO_TIME_TX;
         }
 
         return 0;