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, 28 insertions, 28 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ad3e294acabe..94ab2014fefe 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6641,25 +6641,25 @@ static int nl80211_send_survey(struct sk_buff *msg, u32 portid, u32 seq,
         if ((survey->filled & SURVEY_INFO_IN_USE) &&
             nla_put_flag(msg, NL80211_SURVEY_INFO_IN_USE))
                 goto nla_put_failure;
-        if ((survey->filled & SURVEY_INFO_CHANNEL_TIME) &&
-            nla_put_u64(msg, NL80211_SURVEY_INFO_CHANNEL_TIME,
-                        survey->channel_time))
+        if ((survey->filled & SURVEY_INFO_TIME) &&
+            nla_put_u64(msg, NL80211_SURVEY_INFO_TIME,
+                        survey->time))
                 goto nla_put_failure;
-        if ((survey->filled & SURVEY_INFO_CHANNEL_TIME_BUSY) &&
-            nla_put_u64(msg, NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY,
-                        survey->channel_time_busy))
+        if ((survey->filled & SURVEY_INFO_TIME_BUSY) &&
+            nla_put_u64(msg, NL80211_SURVEY_INFO_TIME_BUSY,
+                        survey->time_busy))
                 goto nla_put_failure;
-        if ((survey->filled & SURVEY_INFO_CHANNEL_TIME_EXT_BUSY) &&
-            nla_put_u64(msg, NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY,
-                        survey->channel_time_ext_busy))
+        if ((survey->filled & SURVEY_INFO_TIME_EXT_BUSY) &&
+            nla_put_u64(msg, NL80211_SURVEY_INFO_TIME_EXT_BUSY,
+                        survey->time_ext_busy))
                 goto nla_put_failure;
-        if ((survey->filled & SURVEY_INFO_CHANNEL_TIME_RX) &&
-            nla_put_u64(msg, NL80211_SURVEY_INFO_CHANNEL_TIME_RX,
-                        survey->channel_time_rx))
+        if ((survey->filled & SURVEY_INFO_TIME_RX) &&
+            nla_put_u64(msg, NL80211_SURVEY_INFO_TIME_RX,
+                        survey->time_rx))
                 goto nla_put_failure;
-        if ((survey->filled & SURVEY_INFO_CHANNEL_TIME_TX) &&
-            nla_put_u64(msg, NL80211_SURVEY_INFO_CHANNEL_TIME_TX,
-                        survey->channel_time_tx))
+        if ((survey->filled & SURVEY_INFO_TIME_TX) &&
+            nla_put_u64(msg, NL80211_SURVEY_INFO_TIME_TX,
+                        survey->time_tx))
                 goto nla_put_failure;
 
         nla_nest_end(msg, infoattr);
diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index ad38910f7036..bbb7afc264af 100644
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -1604,11 +1604,11 @@ TRACE_EVENT(rdev_return_int_survey_info,
                 WIPHY_ENTRY
                 CHAN_ENTRY
                 __field(int, ret)
-                __field(u64, channel_time)
-                __field(u64, channel_time_busy)
-                __field(u64, channel_time_ext_busy)
-                __field(u64, channel_time_rx)
-                __field(u64, channel_time_tx)
+                __field(u64, time)
+                __field(u64, time_busy)
+                __field(u64, time_ext_busy)
+                __field(u64, time_rx)
+                __field(u64, time_tx)
                 __field(u32, filled)
                 __field(s8, noise)
         ),
@@ -1616,11 +1616,11 @@ TRACE_EVENT(rdev_return_int_survey_info,
                 WIPHY_ASSIGN;
                 CHAN_ASSIGN(info->channel);
                 __entry->ret = ret;
-                __entry->channel_time = info->channel_time;
-                __entry->channel_time_busy = info->channel_time_busy;
-                __entry->channel_time_ext_busy = info->channel_time_ext_busy;
-                __entry->channel_time_rx = info->channel_time_rx;
-                __entry->channel_time_tx = info->channel_time_tx;
+                __entry->time = info->time;
+                __entry->time_busy = info->time_busy;
+                __entry->time_ext_busy = info->time_ext_busy;
+                __entry->time_rx = info->time_rx;
+                __entry->time_tx = info->time_tx;
                 __entry->filled = info->filled;
                 __entry->noise = info->noise;
         ),
@@ -1629,9 +1629,9 @@ TRACE_EVENT(rdev_return_int_survey_info,
                   "channel time extension busy: %llu, channel time rx: %llu, "
                   "channel time tx: %llu, filled: %u, noise: %d",
                   WIPHY_PR_ARG, __entry->ret, CHAN_PR_ARG,
-                  __entry->channel_time, __entry->channel_time_busy,
-                  __entry->channel_time_ext_busy, __entry->channel_time_rx,
-                  __entry->channel_time_tx, __entry->filled, __entry->noise)
+                  __entry->time, __entry->time_busy,
+                  __entry->time_ext_busy, __entry->time_rx,
+                  __entry->time_tx, __entry->filled, __entry->noise)
 );
 
 TRACE_EVENT(rdev_tdls_oper,