---

yaml --- r: 278311 b: refs/heads/master c: fc33cc7 h: refs/heads/master i: 278309: 42122a9 278307: 8b2c0db 278303: 396b7be v: v3
git-mirror · Dec 1, 2011 · c046171 · c046171
1 parent 8bd2cca
commit c046171
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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);
 }
 
 /*