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);
 }
 
 /*