From 71cd958b9dee42cffa86cf679ffe7ea2f8b18f64 Mon Sep 17 00:00:00 2001 From: Daniel Turull Date: Thu, 10 Jun 2010 23:08:11 -0700 Subject: [PATCH] --- yaml --- r: 200379 b: refs/heads/master c: 07a0f0f07a68014c92c752a5598102372bddf46e h: refs/heads/master i: 200377: d616b2c44096cd024f346139d40207902a36b54d 200375: 6dececa72360d0625bd099eeb699b270a6c10e1a v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 591df334404c..1c6f5d9fecbd 100644 --- 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 index 2ad68da418df..1dacd7ba8dbb 100644 --- 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)