diff options
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/act_police.c | 4 | ||||
-rw-r--r-- | net/sched/sch_fq.c | 4 | ||||
-rw-r--r-- | net/sched/sch_htb.c | 6 | ||||
-rw-r--r-- | net/sched/sch_tbf.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 0566e4606a4a..f32bcb094915 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c | |||
@@ -231,7 +231,7 @@ override: | |||
231 | if (ret != ACT_P_CREATED) | 231 | if (ret != ACT_P_CREATED) |
232 | return ret; | 232 | return ret; |
233 | 233 | ||
234 | police->tcfp_t_c = ktime_to_ns(ktime_get()); | 234 | police->tcfp_t_c = ktime_get_ns(); |
235 | police->tcf_index = parm->index ? parm->index : | 235 | police->tcf_index = parm->index ? parm->index : |
236 | tcf_hash_new_index(hinfo); | 236 | tcf_hash_new_index(hinfo); |
237 | h = tcf_hash(police->tcf_index, POL_TAB_MASK); | 237 | h = tcf_hash(police->tcf_index, POL_TAB_MASK); |
@@ -279,7 +279,7 @@ static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a, | |||
279 | return police->tcfp_result; | 279 | return police->tcfp_result; |
280 | } | 280 | } |
281 | 281 | ||
282 | now = ktime_to_ns(ktime_get()); | 282 | now = ktime_get_ns(); |
283 | toks = min_t(s64, now - police->tcfp_t_c, | 283 | toks = min_t(s64, now - police->tcfp_t_c, |
284 | police->tcfp_burst); | 284 | police->tcfp_burst); |
285 | if (police->peak_present) { | 285 | if (police->peak_present) { |
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c index ba32c2b005d0..e12f997e1b4c 100644 --- a/net/sched/sch_fq.c +++ b/net/sched/sch_fq.c | |||
@@ -416,7 +416,7 @@ static void fq_check_throttled(struct fq_sched_data *q, u64 now) | |||
416 | static struct sk_buff *fq_dequeue(struct Qdisc *sch) | 416 | static struct sk_buff *fq_dequeue(struct Qdisc *sch) |
417 | { | 417 | { |
418 | struct fq_sched_data *q = qdisc_priv(sch); | 418 | struct fq_sched_data *q = qdisc_priv(sch); |
419 | u64 now = ktime_to_ns(ktime_get()); | 419 | u64 now = ktime_get_ns(); |
420 | struct fq_flow_head *head; | 420 | struct fq_flow_head *head; |
421 | struct sk_buff *skb; | 421 | struct sk_buff *skb; |
422 | struct fq_flow *f; | 422 | struct fq_flow *f; |
@@ -787,7 +787,7 @@ nla_put_failure: | |||
787 | static int fq_dump_stats(struct Qdisc *sch, struct gnet_dump *d) | 787 | static int fq_dump_stats(struct Qdisc *sch, struct gnet_dump *d) |
788 | { | 788 | { |
789 | struct fq_sched_data *q = qdisc_priv(sch); | 789 | struct fq_sched_data *q = qdisc_priv(sch); |
790 | u64 now = ktime_to_ns(ktime_get()); | 790 | u64 now = ktime_get_ns(); |
791 | struct tc_fq_qd_stats st = { | 791 | struct tc_fq_qd_stats st = { |
792 | .gc_flows = q->stat_gc_flows, | 792 | .gc_flows = q->stat_gc_flows, |
793 | .highprio_packets = q->stat_internal_packets, | 793 | .highprio_packets = q->stat_internal_packets, |
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 9f949abcacef..aea942ce6008 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
@@ -895,7 +895,7 @@ ok: | |||
895 | 895 | ||
896 | if (!sch->q.qlen) | 896 | if (!sch->q.qlen) |
897 | goto fin; | 897 | goto fin; |
898 | q->now = ktime_to_ns(ktime_get()); | 898 | q->now = ktime_get_ns(); |
899 | start_at = jiffies; | 899 | start_at = jiffies; |
900 | 900 | ||
901 | next_event = q->now + 5LLU * NSEC_PER_SEC; | 901 | next_event = q->now + 5LLU * NSEC_PER_SEC; |
@@ -1225,7 +1225,7 @@ static void htb_parent_to_leaf(struct htb_sched *q, struct htb_class *cl, | |||
1225 | parent->un.leaf.q = new_q ? new_q : &noop_qdisc; | 1225 | parent->un.leaf.q = new_q ? new_q : &noop_qdisc; |
1226 | parent->tokens = parent->buffer; | 1226 | parent->tokens = parent->buffer; |
1227 | parent->ctokens = parent->cbuffer; | 1227 | parent->ctokens = parent->cbuffer; |
1228 | parent->t_c = ktime_to_ns(ktime_get()); | 1228 | parent->t_c = ktime_get_ns(); |
1229 | parent->cmode = HTB_CAN_SEND; | 1229 | parent->cmode = HTB_CAN_SEND; |
1230 | } | 1230 | } |
1231 | 1231 | ||
@@ -1455,7 +1455,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, | |||
1455 | cl->tokens = PSCHED_TICKS2NS(hopt->buffer); | 1455 | cl->tokens = PSCHED_TICKS2NS(hopt->buffer); |
1456 | cl->ctokens = PSCHED_TICKS2NS(hopt->cbuffer); | 1456 | cl->ctokens = PSCHED_TICKS2NS(hopt->cbuffer); |
1457 | cl->mbuffer = 60ULL * NSEC_PER_SEC; /* 1min */ | 1457 | cl->mbuffer = 60ULL * NSEC_PER_SEC; /* 1min */ |
1458 | cl->t_c = ktime_to_ns(ktime_get()); | 1458 | cl->t_c = ktime_get_ns(); |
1459 | cl->cmode = HTB_CAN_SEND; | 1459 | cl->cmode = HTB_CAN_SEND; |
1460 | 1460 | ||
1461 | /* attach to the hash list and parent's family */ | 1461 | /* attach to the hash list and parent's family */ |
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index 18ff63433709..0c39b754083b 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c | |||
@@ -239,7 +239,7 @@ static struct sk_buff *tbf_dequeue(struct Qdisc *sch) | |||
239 | s64 ptoks = 0; | 239 | s64 ptoks = 0; |
240 | unsigned int len = qdisc_pkt_len(skb); | 240 | unsigned int len = qdisc_pkt_len(skb); |
241 | 241 | ||
242 | now = ktime_to_ns(ktime_get()); | 242 | now = ktime_get_ns(); |
243 | toks = min_t(s64, now - q->t_c, q->buffer); | 243 | toks = min_t(s64, now - q->t_c, q->buffer); |
244 | 244 | ||
245 | if (tbf_peak_present(q)) { | 245 | if (tbf_peak_present(q)) { |
@@ -292,7 +292,7 @@ static void tbf_reset(struct Qdisc *sch) | |||
292 | 292 | ||
293 | qdisc_reset(q->qdisc); | 293 | qdisc_reset(q->qdisc); |
294 | sch->q.qlen = 0; | 294 | sch->q.qlen = 0; |
295 | q->t_c = ktime_to_ns(ktime_get()); | 295 | q->t_c = ktime_get_ns(); |
296 | q->tokens = q->buffer; | 296 | q->tokens = q->buffer; |
297 | q->ptokens = q->mtu; | 297 | q->ptokens = q->mtu; |
298 | qdisc_watchdog_cancel(&q->watchdog); | 298 | qdisc_watchdog_cancel(&q->watchdog); |
@@ -431,7 +431,7 @@ static int tbf_init(struct Qdisc *sch, struct nlattr *opt) | |||
431 | if (opt == NULL) | 431 | if (opt == NULL) |
432 | return -EINVAL; | 432 | return -EINVAL; |
433 | 433 | ||
434 | q->t_c = ktime_to_ns(ktime_get()); | 434 | q->t_c = ktime_get_ns(); |
435 | qdisc_watchdog_init(&q->watchdog, sch); | 435 | qdisc_watchdog_init(&q->watchdog, sch); |
436 | q->qdisc = &noop_qdisc; | 436 | q->qdisc = &noop_qdisc; |
437 | 437 | ||