summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2013-12-12 06:57:22 +0400
committerDavid S. Miller <davem@davemloft.net>2013-12-12 07:53:26 +0400
commitd55d282e6af88120ad90e93a88f70e3116dc0e3d (patch)
treea0916db83806b2ec296ada4c9c62088a9813e4e5 /net
parent975022310233fb0f0193873d79a7b8438070fa82 (diff)
downloadlinux-d55d282e6af88120ad90e93a88f70e3116dc0e3d.tar.xz
sch_tbf: use do_div() for 64-bit divide
It's doing a 64-bit divide which is not supported on 32-bit architectures in psched_ns_t2l(). The correct way to do this is to use do_div(). It's introduced by commit cc106e441a63 ("net: sched: tbf: fix the calculation of max_size") Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_tbf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index a44928c6ba24..887e672f9d7d 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -131,8 +131,10 @@ static u64 psched_ns_t2l(const struct psched_ratecfg *r,
do_div(len, NSEC_PER_SEC);
- if (unlikely(r->linklayer == TC_LINKLAYER_ATM))
- len = (len / 53) * 48;
+ if (unlikely(r->linklayer == TC_LINKLAYER_ATM)) {
+ do_div(len, 53);
+ len = len * 48;
+ }
if (len > r->overhead)
len -= r->overhead;