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>

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index c0f3e4d09263e38a39b5e471faba6fc0d321a7e0..721631c3dd3e3588c41b027ed7b8461376d6e4b2 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1344,11 +1344,11 @@ static 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;
        }
 

diff --cc drivers/net/wireless/ath/ath5k/mac80211-ops.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/link.c
Simple merge

diff --cc drivers/net/wireless/ath/carl9170/cmd.c
Simple merge

diff --cc drivers/net/wireless/ath/carl9170/main.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/mwl8k.c
Simple merge

diff --cc drivers/net/wireless/p54/eeprom.c
Simple merge

diff --cc drivers/net/wireless/p54/main.c
Simple merge

diff --cc drivers/net/wireless/p54/txrx.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc include/uapi/linux/nl80211.h
Simple merge

diff --cc net/mac80211/ethtool.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/trace.h
Simple merge