From a7587f1bdba218f332e23f6eca8ee2be8180002d Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 1 Oct 2009 09:29:45 -0700 Subject: [PATCH] --- yaml --- r: 166706 b: refs/heads/master c: 417bc4b855f04dd4ad27a7cabe3e7996a7b78ddb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9a9a1cac57cd..73469b90646d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a00d2102ce01df5f0a8892814ecd26d130d47e7d +refs/heads/master: 417bc4b855f04dd4ad27a7cabe3e7996a7b78ddb diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index 4d11c28ca8ca..b69455217ed6 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -2105,15 +2105,17 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until) { ktime_t start_time, end_time; - s32 remaining; + s64 remaining; struct hrtimer_sleeper t; hrtimer_init_on_stack(&t.timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); hrtimer_set_expires(&t.timer, spin_until); remaining = ktime_to_us(hrtimer_expires_remaining(&t.timer)); - if (remaining <= 0) + if (remaining <= 0) { + pkt_dev->next_tx = ktime_add_ns(spin_until, pkt_dev->delay); return; + } start_time = ktime_now(); if (remaining < 100)