diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-11-14 16:35:34 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-08 15:27:52 +0100 |
| commit | 4ed20bebf51578229a1986efcf46344075ec8447 (patch) | |
| tree | 0016827037195025821cb45dac6061419e190a12 /net/mac80211 | |
| parent | mac80211: Re-fix accounting of the tailroom-needed counter (diff) | |
| download | linux-4ed20bebf51578229a1986efcf46344075ec8447.tar.xz linux-4ed20bebf51578229a1986efcf46344075ec8447.zip | |
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>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/ethtool.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/mac80211/ethtool.c b/net/mac80211/ethtool.c index ebfc8091557b..eea742710c0a 100644 --- a/net/mac80211/ethtool.c +++ b/net/mac80211/ethtool.c @@ -175,24 +175,24 @@ do_survey: data[i++] = (u8)survey.noise; else data[i++] = -1LL; - if (survey.filled & SURVEY_INFO_CHANNEL_TIME) - data[i++] = survey.channel_time; + if (survey.filled & SURVEY_INFO_TIME) + data[i++] = survey.time; else data[i++] = -1LL; - if (survey.filled & SURVEY_INFO_CHANNEL_TIME_BUSY) - data[i++] = survey.channel_time_busy; + if (survey.filled & SURVEY_INFO_TIME_BUSY) + data[i++] = survey.time_busy; else data[i++] = -1LL; - if (survey.filled & SURVEY_INFO_CHANNEL_TIME_EXT_BUSY) - data[i++] = survey.channel_time_ext_busy; + if (survey.filled & SURVEY_INFO_TIME_EXT_BUSY) + data[i++] = survey.time_ext_busy; else data[i++] = -1LL; - if (survey.filled & SURVEY_INFO_CHANNEL_TIME_RX) - data[i++] = survey.channel_time_rx; + if (survey.filled & SURVEY_INFO_TIME_RX) + data[i++] = survey.time_rx; else data[i++] = -1LL; - if (survey.filled & SURVEY_INFO_CHANNEL_TIME_TX) - data[i++] = survey.channel_time_tx; + if (survey.filled & SURVEY_INFO_TIME_TX) + data[i++] = survey.time_tx; else data[i++] = -1LL; |