From c046171ae8d7a2534e93295f91f71e0318ff9767 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 30 Nov 2011 23:32:14 +0000
Subject: [PATCH] --- yaml --- r: 278311 b: refs/heads/master c:
 fc33cc72423ed3474cd51bc8bd7c1cdc22a78e1a h: refs/heads/master i:   278309:
 42122a9a2f8feed807fa4bb7ceae3cdada79ac04   278307:
 8b2c0dbb0c13e9cf64e7cecd7efa8bf521671546   278303:
 396b7be6d5c0a6aa676695ae576a36d56a5e5b3b v: v3

---
 [refs]                      | 2 +-
 trunk/net/sched/sch_netem.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1db0f826b876..07818157af19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8aa953d03eea1190fdde03089947bba09e5399fe
+refs/heads/master: fc33cc72423ed3474cd51bc8bd7c1cdc22a78e1a
diff --git a/trunk/net/sched/sch_netem.c b/trunk/net/sched/sch_netem.c
index 9b7af9f1272f..3bfd73344f76 100644
--- a/trunk/net/sched/sch_netem.c
+++ b/trunk/net/sched/sch_netem.c
@@ -301,7 +301,10 @@ static psched_tdiff_t tabledist(psched_tdiff_t mu, psched_tdiff_t sigma,
 
 static psched_time_t packet_len_2_sched_time(unsigned int len, u32 rate)
 {
-	return PSCHED_NS2TICKS((u64)len * NSEC_PER_SEC / rate);
+	u64 ticks = (u64)len * NSEC_PER_SEC;
+
+	do_div(ticks, rate);
+	return PSCHED_NS2TICKS(ticks);
 }
 
 /*