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 /drivers/net/wireless/rt2x00 | |
parent | db12847ca84b7a315a3ba77c939c9d08df17d54f (diff) | |
download | linux-stable-4ed20bebf51578229a1986efcf46344075ec8447.tar.gz linux-stable-4ed20bebf51578229a1986efcf46344075ec8447.tar.bz2 linux-stable-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 'drivers/net/wireless/rt2x00')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 81ee481487cf..be2d54f257b1 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -8020,13 +8020,13 @@ int rt2800_get_survey(struct ieee80211_hw *hw, int idx, rt2800_register_read(rt2x00dev, CH_BUSY_STA_SEC, &busy_ext); if (idle || busy) { - survey->filled = SURVEY_INFO_CHANNEL_TIME | - SURVEY_INFO_CHANNEL_TIME_BUSY | - SURVEY_INFO_CHANNEL_TIME_EXT_BUSY; + survey->filled = SURVEY_INFO_TIME | + SURVEY_INFO_TIME_BUSY | + SURVEY_INFO_TIME_EXT_BUSY; - survey->channel_time = (idle + busy) / 1000; - survey->channel_time_busy = busy / 1000; - survey->channel_time_ext_busy = busy_ext / 1000; + survey->time = (idle + busy) / 1000; + survey->time_busy = busy / 1000; + survey->time_ext_busy = busy_ext / 1000; } if (!(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) |