summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/main.c
diff options
context:
space:
mode:
authorJohannes Berg2014-11-14 16:35:34 +0100
committerJohannes Berg2015-01-08 15:27:52 +0100
commit4ed20bebf51578229a1986efcf46344075ec8447 (patch)
tree0016827037195025821cb45dac6061419e190a12 /drivers/net/wireless/p54/main.c
parentmac80211: Re-fix accounting of the tailroom-needed counter (diff)
downloadkernel-qcow2-linux-4ed20bebf51578229a1986efcf46344075ec8447.tar.gz
kernel-qcow2-linux-4ed20bebf51578229a1986efcf46344075ec8447.tar.xz
kernel-qcow2-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 'drivers/net/wireless/p54/main.c')
-rw-r--r--drivers/net/wireless/p54/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 13a30c4a27f2..b9250d75d253 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -305,9 +305,9 @@ static void p54_reset_stats(struct p54_common *priv)
struct survey_info *info = &priv->survey[chan->hw_value];
/* only reset channel statistics, don't touch .filled, etc. */
- info->channel_time = 0;
- info->channel_time_busy = 0;
- info->channel_time_tx = 0;
+ info->time = 0;
+ info->time_busy = 0;
+ info->time_tx = 0;
}
priv->update_stats = true;
@@ -636,7 +636,7 @@ static int p54_get_survey(struct ieee80211_hw *dev, int idx,
if (in_use) {
/* test if the reported statistics are valid. */
- if (survey->channel_time != 0) {
+ if (survey->time != 0) {
survey->filled |= SURVEY_INFO_IN_USE;
} else {
/*