diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:35:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:35:17 -0400 |
| commit | b2ab040db85835e54c7559533df7f85902617926 (patch) | |
| tree | b23cbdca55935c497cb88b588e4e8b088d6ab7ab /net/sunrpc/svcsock.c | |
| parent | 1f57389a38dc1e8be167ec601f39f78f0bed3a96 (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
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) | |||
| 587 | struct timeval tv; | 587 | struct timeval tv; |
| 588 | 588 | ||
| 589 | tv.tv_sec = xtime.tv_sec; | 589 | tv.tv_sec = xtime.tv_sec; |
| 590 | tv.tv_usec = xtime.tv_nsec * 1000; | 590 | tv.tv_usec = xtime.tv_nsec / NSEC_PER_USEC; |
| 591 | skb_set_timestamp(skb, &tv); | 591 | skb_set_timestamp(skb, &tv); |
| 592 | /* Don't enable netstamp, sunrpc doesn't | 592 | /* Don't enable netstamp, sunrpc doesn't |
| 593 | need that much accuracy */ | 593 | need that much accuracy */ |