carl9170: Use do_div for 64-bit division to fix 32-bit kernels

Use the do_div macro for 64-bit division. Otherwise, the module will
reference __udivdi3 under 32-bit kernels, which is not allowed in
kernel space.

drivers/built-in.o: In function `carl9170_collect_tally':
cmd.c:191: undefined reference to `__udivdi3'
cmd.c:192: undefined reference to `__udivdi3'
cmd.c:193: undefined reference to `__udivdi3'

Reported-by: Kalle Valo <kvalo@adurom.com>
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Tested-by: Kalle Valo <kvalo@adurom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/carl9170/cmd.c b/drivers/net/wireless/ath/carl9170/cmd.c
index 9970bf8edc40923c8f614ab799ced1eb22494d22..195dc65381104aab0eb1d9657fecf53a3955c915 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/cmd.c
+++ b/drivers/net/wireless/ath/carl9170/cmd.c
@@ -36,6 +36,7 @@
  *    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <asm/div64.h>
 #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;