p54: Use do_div for 64-bit division to fix 32-bit kernels
authorChristian Lamparter <chunkeey@googlemail.com>
Thu, 25 Aug 2011 21:47:35 +0000 (23:47 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Aug 2011 19:25:29 +0000 (15:25 -0400)
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.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/p54/txrx.c

index 44a3bd4b0f43c5258d04db670f62b2ae4ec6a828..2b97a89e7ff8f17af1c55a2f1db70e29d235afaf 100644 (file)
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
+#include <asm/div64.h>
 
 #include <net/mac80211.h>
 
@@ -582,10 +583,13 @@ static void p54_rx_stats(struct p54_common *priv, struct sk_buff *skb)
        if (chan) {
                struct survey_info *survey = &priv->survey[chan->hw_value];
                survey->noise = clamp_t(s8, priv->noise, -128, 127);
-               survey->channel_time = priv->survey_raw.active / 1024;
-               survey->channel_time_tx = priv->survey_raw.tx / 1024;
-               survey->channel_time_busy = priv->survey_raw.cca / 1024 +
-                       survey->channel_time_tx;
+               survey->channel_time = priv->survey_raw.active;
+               survey->channel_time_tx = priv->survey_raw.tx;
+               survey->channel_time_busy = priv->survey_raw.tx +
+                       priv->survey_raw.cca;
+               do_div(survey->channel_time, 1024);
+               do_div(survey->channel_time_tx, 1024);
+               do_div(survey->channel_time_busy, 1024);
        }
 
        tmp = p54_find_and_unlink_skb(priv, hdr->req_id);