diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-04-21 05:34:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-21 05:34:08 -0400 |
commit | f25c3d613b12b4b6219d03e9930cac5f59541468 (patch) | |
tree | 0438cd32c718aaefdb6e083eeb81f7f75e56256a /net/ipv4/icmp.c | |
parent | 263173af5b4635c07dd862255e5b767cd429c640 (diff) |
[IPV4]: Convert do_gettimeofday() to getnstimeofday().
What do_gettimeofday() does is to call getnstimeofday() and
to convert the result from timespec{} to timeval{}.
After that, these callers convert the result again to msec.
Use getnstimeofday() and convert the units at once.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/icmp.c')
-rw-r--r-- | net/ipv4/icmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index fee171ec6588..c67d00e8c600 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -847,7 +847,7 @@ static void icmp_echo(struct sk_buff *skb) | |||
847 | */ | 847 | */ |
848 | static void icmp_timestamp(struct sk_buff *skb) | 848 | static void icmp_timestamp(struct sk_buff *skb) |
849 | { | 849 | { |
850 | struct timeval tv; | 850 | struct timespec tv; |
851 | struct icmp_bxm icmp_param; | 851 | struct icmp_bxm icmp_param; |
852 | /* | 852 | /* |
853 | * Too short. | 853 | * Too short. |
@@ -858,9 +858,9 @@ static void icmp_timestamp(struct sk_buff *skb) | |||
858 | /* | 858 | /* |
859 | * Fill in the current time as ms since midnight UT: | 859 | * Fill in the current time as ms since midnight UT: |
860 | */ | 860 | */ |
861 | do_gettimeofday(&tv); | 861 | getnstimeofday(&tv); |
862 | icmp_param.data.times[1] = htonl((tv.tv_sec % 86400) * 1000 + | 862 | icmp_param.data.times[1] = htonl((tv.tv_sec % 86400) * MSEC_PER_SEC + |
863 | tv.tv_usec / 1000); | 863 | tv.tv_nsec / NSEC_PER_MSEC); |
864 | icmp_param.data.times[2] = icmp_param.data.times[1]; | 864 | icmp_param.data.times[2] = icmp_param.data.times[1]; |
865 | if (skb_copy_bits(skb, 0, &icmp_param.data.times[0], 4)) | 865 | if (skb_copy_bits(skb, 0, &icmp_param.data.times[0], 4)) |
866 | BUG(); | 866 | BUG(); |