From 6572946768e266800783ba82f25cc8a50d186e11 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 3 Oct 2009 01:39:18 +0000
Subject: [PATCH] --- yaml --- r: 166970 b: refs/heads/master c:
 9240d7154e766ce6f3b615e81ed28f7562f509a5 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 2c9bbc5569c8..2cfaae1bcd58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 896a7cf8d846a9e86fb823be16f4f14ffeb7f074
+refs/heads/master: 9240d7154e766ce6f3b615e81ed28f7562f509a5
diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c
index 421857c8c071..86acdba0a97d 100644
--- a/trunk/net/core/pktgen.c
+++ b/trunk/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);