From: Andrew Morton <akpm@osdl.org>
Date: Wed, 26 Oct 2005 08:59:03 +0000 (-0700)
Subject: [PATCH] svcsock timestamp fix
X-Git-Tag: v2.6.14~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4bcde03d41d2264edb4ea3c47cb27da1e2609e48;p=linux-2.6-omap-h63xx.git

[PATCH] svcsock timestamp fix

Convert nanoseconds to microseconds correctly.

Spotted by Steve Dickson <SteveD@redhat.com>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 30ec3efc48a..691dea4a58e 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -587,7 +587,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
 		struct timeval tv;
 
 		tv.tv_sec = xtime.tv_sec;
-		tv.tv_usec = xtime.tv_nsec * 1000;
+		tv.tv_usec = xtime.tv_nsec / NSEC_PER_USEC;
 		skb_set_timestamp(skb, &tv);
 		/* Don't enable netstamp, sunrpc doesn't 
 		   need that much accuracy */