Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6

This commit is contained in:
Trond Myklebust
2005-10-27 19:12:49 -04:00
66 changed files with 735 additions and 502 deletions

View File

@@ -584,7 +584,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 */