Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next

[cascardo/linux.git] / drivers / net / wireless / ath / carl9170 / cmd.c

diff --git a/drivers/net/wireless/ath/carl9170/cmd.c b/drivers/net/wireless/ath/carl9170/cmd.c
index 39a6387..f2b4f53 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/cmd.c
+++ b/drivers/net/wireless/ath/carl9170/cmd.c
@@ -188,12 +188,12 @@ int carl9170_collect_tally(struct ar9170 *ar)
 
                if (ar->channel) {
                        info = &ar->survey[ar->channel->hw_value];
-                       info->channel_time = ar->tally.active;
-                       info->channel_time_busy = ar->tally.cca;
-                       info->channel_time_tx = ar->tally.tx_time;
-                       do_div(info->channel_time, 1000);
-                       do_div(info->channel_time_busy, 1000);
-                       do_div(info->channel_time_tx, 1000);
+                       info->time = ar->tally.active;
+                       info->time_busy = ar->tally.cca;
+                       info->time_tx = ar->tally.tx_time;
+                       do_div(info->time, 1000);
+                       do_div(info->time_busy, 1000);
+                       do_div(info->time_tx, 1000);
                }
        }
        return 0;