History

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.

Johannes Berg committed 12 years ago

Commit 4ed20be1 parent db1284716 files · +135 −127Browse files

Showing the changes to include/uapi/linux (1 of 16 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+17−10
@@ -2815,15 +2815,15 @@ enum nl80211_user_reg_hint_type { · 2814 unmodified lines
2815 * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel2815 * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
2816 * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)2816 * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
2817 * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used2817 * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used
2818 * @NL80211_SURVEY_INFO_CHANNEL_TIME: amount of time (in ms) that the radio2818 * @NL80211_SURVEY_INFO_TIME: amount of time (in ms) that the radio
2819 * spent on this channel2819 * spent on this channel
2820 * @NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY: amount of the time the primary2820 * @NL80211_SURVEY_INFO_TIME_BUSY: amount of the time the primary
2821 * channel was sensed busy (either due to activity or energy detect)2821 * channel was sensed busy (either due to activity or energy detect)
2822 * @NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY: amount of time the extension2822 * @NL80211_SURVEY_INFO_TIME_EXT_BUSY: amount of time the extension
2823 * channel was sensed busy2823 * channel was sensed busy
2824 * @NL80211_SURVEY_INFO_CHANNEL_TIME_RX: amount of time the radio spent2824 * @NL80211_SURVEY_INFO_TIME_RX: amount of time the radio spent
2825 * receiving data2825 * receiving data
2826 * @NL80211_SURVEY_INFO_CHANNEL_TIME_TX: amount of time the radio spent2826 * @NL80211_SURVEY_INFO_TIME_TX: amount of time the radio spent
2827 * transmitting data2827 * transmitting data
2828 * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number2828 * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
2829 * currently defined2829 * currently defined
@@ -2834,17 +2834,24 @@ enum nl80211_survey_info { · 4 unmodified lines
2834 NL80211_SURVEY_INFO_FREQUENCY,2834 NL80211_SURVEY_INFO_FREQUENCY,
2835 NL80211_SURVEY_INFO_NOISE,2835 NL80211_SURVEY_INFO_NOISE,
2836 NL80211_SURVEY_INFO_IN_USE,2836 NL80211_SURVEY_INFO_IN_USE,
2837 NL80211_SURVEY_INFO_CHANNEL_TIME,2837 NL80211_SURVEY_INFO_TIME,
2838 NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY,2838 NL80211_SURVEY_INFO_TIME_BUSY,
2839 NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY,2839 NL80211_SURVEY_INFO_TIME_EXT_BUSY,
2840 NL80211_SURVEY_INFO_CHANNEL_TIME_RX,2840 NL80211_SURVEY_INFO_TIME_RX,
2841 NL80211_SURVEY_INFO_CHANNEL_TIME_TX,2841 NL80211_SURVEY_INFO_TIME_TX,
2842 2842
2843 /* keep last */2843 /* keep last */
2844 __NL80211_SURVEY_INFO_AFTER_LAST,2844 __NL80211_SURVEY_INFO_AFTER_LAST,
2845 NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 12845 NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1
2846};2846};
2847 2847
2848/* keep old names for compatibility */
2849#define NL80211_SURVEY_INFO_CHANNEL_TIME NL80211_SURVEY_INFO_TIME
2850#define NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY NL80211_SURVEY_INFO_TIME_BUSY
2851#define NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY NL80211_SURVEY_INFO_TIME_EXT_BUSY
2852#define NL80211_SURVEY_INFO_CHANNEL_TIME_RX NL80211_SURVEY_INFO_TIME_RX
2853#define NL80211_SURVEY_INFO_CHANNEL_TIME_TX NL80211_SURVEY_INFO_TIME_TX
2854
2848/**2855/**
2849 * enum nl80211_mntr_flags - monitor configuration flags2856 * enum nl80211_mntr_flags - monitor configuration flags
2850 *2857 *