From 1331d4849087b1b377e42642f81b927d7e07157d Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 25 Aug 2011 15:00:54 +0200 Subject: [PATCH] --- yaml --- r: 265697 b: refs/heads/master c: 80d6e96be80593ae98a5d68c9ae4e054359d1a89 h: refs/heads/master i: 265695: ae49627391fd4835e6dd3a55b850c206a07407c9 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/carl9170/cmd.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 23dd307c78c3..837f804978e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a63ef0faf90985c847a2f924a72a22830ed1c10 +refs/heads/master: 80d6e96be80593ae98a5d68c9ae4e054359d1a89 diff --git a/trunk/drivers/net/wireless/ath/carl9170/cmd.c b/trunk/drivers/net/wireless/ath/carl9170/cmd.c index 9970bf8edc40..195dc6538110 100644 --- a/trunk/drivers/net/wireless/ath/carl9170/cmd.c +++ b/trunk/drivers/net/wireless/ath/carl9170/cmd.c @@ -36,6 +36,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include "carl9170.h" #include "cmd.h" @@ -187,10 +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 / 1000; - info->channel_time_busy = ar->tally.cca / 1000; - info->channel_time_tx = ar->tally.tx_time / 1000; + 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); } } return 0;