aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-27 19:12:49 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-27 19:12:49 -0400
commit4c2cb58c552a34744979a99ccf01762d5eb7e288 (patch)
treefd35360eb0cb08b07f3a5f4bdf1ebd90a769311d /net/sunrpc
parent34123da66e613602de5a886b05c875b6a91b8ed2 (diff)
parent72ab373a5688a78cbdaf3bf96012e597d5399bb7 (diff)
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/svcsock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 130f2b5d93dd..f16e7cdd6150 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -584,7 +584,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
584 struct timeval tv; 584 struct timeval tv;
585 585
586 tv.tv_sec = xtime.tv_sec; 586 tv.tv_sec = xtime.tv_sec;
587 tv.tv_usec = xtime.tv_nsec * 1000; 587 tv.tv_usec = xtime.tv_nsec / NSEC_PER_USEC;
588 skb_set_timestamp(skb, &tv); 588 skb_set_timestamp(skb, &tv);
589 /* Don't enable netstamp, sunrpc doesn't 589 /* Don't enable netstamp, sunrpc doesn't
590 need that much accuracy */ 590 need that much accuracy */