Commit 1cda0fd6 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville

p54: 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.
Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 397e5d5b
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <asm/div64.h>
#include <net/mac80211.h> #include <net/mac80211.h>
...@@ -582,10 +583,13 @@ static void p54_rx_stats(struct p54_common *priv, struct sk_buff *skb) ...@@ -582,10 +583,13 @@ static void p54_rx_stats(struct p54_common *priv, struct sk_buff *skb)
if (chan) { if (chan) {
struct survey_info *survey = &priv->survey[chan->hw_value]; struct survey_info *survey = &priv->survey[chan->hw_value];
survey->noise = clamp_t(s8, priv->noise, -128, 127); survey->noise = clamp_t(s8, priv->noise, -128, 127);
survey->channel_time = priv->survey_raw.active / 1024; survey->channel_time = priv->survey_raw.active;
survey->channel_time_tx = priv->survey_raw.tx / 1024; survey->channel_time_tx = priv->survey_raw.tx;
survey->channel_time_busy = priv->survey_raw.cca / 1024 + survey->channel_time_busy = priv->survey_raw.tx +
survey->channel_time_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); tmp = p54_find_and_unlink_skb(priv, hdr->req_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment