1 files changed, 17 insertions, 10 deletions

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 7ba9404b290d..1a5acc80ab88 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2815,15 +2815,15 @@ enum nl80211_user_reg_hint_type {
  * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
  * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
  * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used
- * @NL80211_SURVEY_INFO_CHANNEL_TIME: amount of time (in ms) that the radio
+ * @NL80211_SURVEY_INFO_TIME: amount of time (in ms) that the radio
  *      spent on this channel
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY: amount of the time the primary
+ * @NL80211_SURVEY_INFO_TIME_BUSY: amount of the time the primary
  *      channel was sensed busy (either due to activity or energy detect)
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY: amount of time the extension
+ * @NL80211_SURVEY_INFO_TIME_EXT_BUSY: amount of time the extension
  *      channel was sensed busy
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_RX: amount of time the radio spent
+ * @NL80211_SURVEY_INFO_TIME_RX: amount of time the radio spent
  *      receiving data
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_TX: amount of time the radio spent
+ * @NL80211_SURVEY_INFO_TIME_TX: amount of time the radio spent
  *      transmitting data
  * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
  *      currently defined
@@ -2834,17 +2834,24 @@ enum nl80211_survey_info {
         NL80211_SURVEY_INFO_FREQUENCY,
         NL80211_SURVEY_INFO_NOISE,
         NL80211_SURVEY_INFO_IN_USE,
-        NL80211_SURVEY_INFO_CHANNEL_TIME,
-        NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY,
-        NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY,
-        NL80211_SURVEY_INFO_CHANNEL_TIME_RX,
-        NL80211_SURVEY_INFO_CHANNEL_TIME_TX,
+        NL80211_SURVEY_INFO_TIME,
+        NL80211_SURVEY_INFO_TIME_BUSY,
+        NL80211_SURVEY_INFO_TIME_EXT_BUSY,
+        NL80211_SURVEY_INFO_TIME_RX,
+        NL80211_SURVEY_INFO_TIME_TX,
 
         /* keep last */
         __NL80211_SURVEY_INFO_AFTER_LAST,
         NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1
 };
 
+/* keep old names for compatibility */
+#define NL80211_SURVEY_INFO_CHANNEL_TIME                NL80211_SURVEY_INFO_TIME
+#define NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY           NL80211_SURVEY_INFO_TIME_BUSY
+#define NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY       NL80211_SURVEY_INFO_TIME_EXT_BUSY
+#define NL80211_SURVEY_INFO_CHANNEL_TIME_RX             NL80211_SURVEY_INFO_TIME_RX
+#define NL80211_SURVEY_INFO_CHANNEL_TIME_TX             NL80211_SURVEY_INFO_TIME_TX
+
 /**
  * enum nl80211_mntr_flags - monitor configuration flags
  *