cfg80211: remove "channel" from survey names

[deliverable/linux.git] / drivers / net / wireless / p54 / main.c

diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 13a30c4a27f29897b5f8213d433390da70ca08a8..b9250d75d2539d827aec114a83e8056faec389aa 100644 (file)
--- 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 {
                                /*