diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:43:20 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:43:20 -0400 |
| commit | 26ba2a7a9f4d8921f095af646a7d22c15a148028 (patch) | |
| tree | 1e694da6999653551bc61eb9cc6db2eb4645fcd1 /net/sunrpc/svcsock.c | |
| parent | 91190758d410a5d33c6051ba9ca95baa430256bb (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
| download | talos-op-linux-26ba2a7a9f4d8921f095af646a7d22c15a148028.tar.gz talos-op-linux-26ba2a7a9f4d8921f095af646a7d22c15a148028.zip | |
Merge branch 'master'
Diffstat (limited to 'net/sunrpc/svcsock.c')
| -rw-r--r-- | net/sunrpc/svcsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 30ec3efc48a6..691dea4a58e7 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 */ |
