diff options
Diffstat (limited to 'net/sched/sch_tbf.c')
-rw-r--r-- | net/sched/sch_tbf.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 | ||