---

yaml --- r: 200379 b: refs/heads/master c: 07a0f0f h: refs/heads/master i: 200377: d616b2c 200375: 6dececa v: v3
git-mirror · Jun 11, 2010 · 71cd958 · 71cd958
1 parent e52f874
commit 71cd958
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae638c47dc040b8def16d05dc6acdd527628f231
+refs/heads/master: 07a0f0f07a68014c92c752a5598102372bddf46e
diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c
@@ -2170,7 +2170,7 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until)
 	end_time = ktime_now();
 
 	pkt_dev->idle_acc += ktime_to_ns(ktime_sub(end_time, start_time));
-	pkt_dev->next_tx = ktime_add_ns(end_time, pkt_dev->delay);
+	pkt_dev->next_tx = ktime_add_ns(spin_until, pkt_dev->delay);
 }
 
 static inline void set_pkt_overhead(struct pktgen_dev *pkt_dev)