From fbe7ba67027136f9667ed9d8d2073200c9eadad6 Mon Sep 17 00:00:00 2001 From: Daniel Turull Date: Wed, 9 Mar 2011 14:11:00 -0800 Subject: [PATCH] --- yaml --- r: 233890 b: refs/heads/master c: 03a14ab134f4811ab1475f07b1305ccaf38b690f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index af88d9f3fe6b..1ac780f0bcd0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c91afe1a984d43f922a6a70c7c390b7fb8de45e +refs/heads/master: 03a14ab134f4811ab1475f07b1305ccaf38b690f diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index a9e7fc4c461f..b5bada92f637 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -3321,7 +3321,7 @@ static void show_results(struct pktgen_dev *pkt_dev, int nr_frags) pkt_dev->started_at); ktime_t idle = ns_to_ktime(pkt_dev->idle_acc); - p += sprintf(p, "OK: %llu(c%llu+d%llu) nsec, %llu (%dbyte,%dfrags)\n", + p += sprintf(p, "OK: %llu(c%llu+d%llu) usec, %llu (%dbyte,%dfrags)\n", (unsigned long long)ktime_to_us(elapsed), (unsigned long long)ktime_to_us(ktime_sub(elapsed, idle)), (unsigned long long)ktime_to_us(idle),