diff options
author | Patrick McHardy <kaber@trash.net> | 2006-01-09 01:12:03 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-09 17:16:05 -0500 |
commit | 538e43a4bd36ae49873ef7097a16a207f5d9912b (patch) | |
tree | 11a7a9ea4594993c559a247d6ff373dc00b77e1c /net/sched | |
parent | 2941a4863154982918d39a639632c76eeacfa884 (diff) |
[PKT_SCHED]: Use USEC_PER_SEC
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/sch_hfsc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index c26764bc4103..cad1758ec0df 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
@@ -208,7 +208,7 @@ struct hfsc_sched | |||
208 | do { \ | 208 | do { \ |
209 | struct timeval tv; \ | 209 | struct timeval tv; \ |
210 | do_gettimeofday(&tv); \ | 210 | do_gettimeofday(&tv); \ |
211 | (stamp) = 1000000ULL * tv.tv_sec + tv.tv_usec; \ | 211 | (stamp) = 1ULL * USEC_PER_SEC * tv.tv_sec + tv.tv_usec; \ |
212 | } while (0) | 212 | } while (0) |
213 | #endif | 213 | #endif |
214 | 214 | ||
@@ -502,8 +502,8 @@ d2dx(u32 d) | |||
502 | u64 dx; | 502 | u64 dx; |
503 | 503 | ||
504 | dx = ((u64)d * PSCHED_JIFFIE2US(HZ)); | 504 | dx = ((u64)d * PSCHED_JIFFIE2US(HZ)); |
505 | dx += 1000000 - 1; | 505 | dx += USEC_PER_SEC - 1; |
506 | do_div(dx, 1000000); | 506 | do_div(dx, USEC_PER_SEC); |
507 | return dx; | 507 | return dx; |
508 | } | 508 | } |
509 | 509 | ||
@@ -523,7 +523,7 @@ dx2d(u64 dx) | |||
523 | { | 523 | { |
524 | u64 d; | 524 | u64 d; |
525 | 525 | ||
526 | d = dx * 1000000; | 526 | d = dx * USEC_PER_SEC; |
527 | do_div(d, PSCHED_JIFFIE2US(HZ)); | 527 | do_div(d, PSCHED_JIFFIE2US(HZ)); |
528 | return (u32)d; | 528 | return (u32)d; |
529 | } | 529 | } |