aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/pktgen.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-10 17:26:00 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-10 17:26:00 -0500
commit33175d84ee3fa29991adb80513683e010769e807 (patch)
tree3731f61cf82451b6892cf1368701e57e35d92908 /net/core/pktgen.c
parentc5908939b2738bafe1b309bc2465cb9f2e6184c5 (diff)
parent6dfbd87a20a737641ef228230c77f4262434fa24 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bnx2x/bnx2x_cmn.c
Diffstat (limited to 'net/core/pktgen.c')
-rw-r--r--net/core/pktgen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index d73b77adb676..f0aec6c39ecd 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3271,7 +3271,7 @@ static void show_results(struct pktgen_dev *pkt_dev, int nr_frags)
3271 pkt_dev->started_at); 3271 pkt_dev->started_at);
3272 ktime_t idle = ns_to_ktime(pkt_dev->idle_acc); 3272 ktime_t idle = ns_to_ktime(pkt_dev->idle_acc);
3273 3273
3274 p += sprintf(p, "OK: %llu(c%llu+d%llu) nsec, %llu (%dbyte,%dfrags)\n", 3274 p += sprintf(p, "OK: %llu(c%llu+d%llu) usec, %llu (%dbyte,%dfrags)\n",
3275 (unsigned long long)ktime_to_us(elapsed), 3275 (unsigned long long)ktime_to_us(elapsed),
3276 (unsigned long long)ktime_to_us(ktime_sub(elapsed, idle)), 3276 (unsigned long long)ktime_to_us(ktime_sub(elapsed, idle)),
3277 (unsigned long long)ktime_to_us(idle), 3277 (unsigned long long)ktime_to_us(idle),