summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-10-03 05:39:18 +0400
committerDavid S. Miller <davem@davemloft.net>2009-10-05 08:08:58 +0400
commit9240d7154e766ce6f3b615e81ed28f7562f509a5 (patch)
treed8bc456e4b38cde9e4c5a5128f37dac5f66c6f0d /net
parent896a7cf8d846a9e86fb823be16f4f14ffeb7f074 (diff)
downloadlinux-9240d7154e766ce6f3b615e81ed28f7562f509a5.tar.xz
pktgen: restore nanosec delays
Commit fd29cf72 (pktgen: convert to use ktime_t) inadvertantly converted "delay" parameter from nanosec to microsec. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-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 421857c8c071..86acdba0a97d 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -964,7 +964,7 @@ static ssize_t pktgen_if_write(struct file *file,
if (value == 0x7FFFFFFF)
pkt_dev->delay = ULLONG_MAX;
else
- pkt_dev->delay = (u64)value * NSEC_PER_USEC;
+ pkt_dev->delay = (u64)value;
sprintf(pg_result, "OK: delay=%llu",
(unsigned long long) pkt_dev->delay);