diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-09 16:00:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-09 16:00:05 -0700 |
| commit | 25f13053651569bd0c87927ff49d07d9225feadb (patch) | |
| tree | 12d9b6a690c314be5b2e3f8423c5a82618b96508 /net/sunrpc/svcsock.c | |
| parent | db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 (diff) | |
| parent | d64d3873721cfe870d49d73c3744f06260779ce7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 56db8f13e6c..d0c3120d023 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -586,7 +586,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp) } if (skb->stamp.tv_sec == 0) { skb->stamp.tv_sec = xtime.tv_sec; - skb->stamp.tv_usec = xtime.tv_nsec * 1000; + skb->stamp.tv_usec = xtime.tv_nsec / NSEC_PER_USEC; /* Don't enable netstamp, sunrpc doesn't need that much accuracy */ } |