Commit 46baac38 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

pkt_sched: use ns_to_ktime() helper 



ns_to_ktime() seems better than ktime_set() + ktime_add_ns()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47c1b7b9

net/sched/sch_api.c

+4 −5
Original line number Diff line number Diff line
@@ -495,16 +495,15 @@ EXPORT_SYMBOL(qdisc_watchdog_init); 


void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires)

{

	ktime_t time;



	if (test_bit(__QDISC_STATE_DEACTIVATED,

		     &qdisc_root_sleeping(wd->qdisc)->state))

		return;



	qdisc_throttled(wd->qdisc);

	time = ktime_set(0, 0);

	time = ktime_add_ns(time, PSCHED_TICKS2NS(expires));

	hrtimer_start(&wd->timer, time, HRTIMER_MODE_ABS);



	hrtimer_start(&wd->timer,

		      ns_to_ktime(PSCHED_TICKS2NS(expires)),

		      HRTIMER_MODE_ABS);

}

EXPORT_SYMBOL(qdisc_watchdog_schedule);

net/sched/sch_cbq.c

+1 −2
Original line number Diff line number Diff line
@@ -509,8 +509,7 @@ static void cbq_ovl_delay(struct cbq_class *cl) 
			cl->cpriority = TC_CBQ_MAXPRIO;

			q->pmask |= (1<<TC_CBQ_MAXPRIO);



			expires = ktime_set(0, 0);

			expires = ktime_add_ns(expires, PSCHED_TICKS2NS(sched));

			expires = ns_to_ktime(PSCHED_TICKS2NS(sched));

			if (hrtimer_try_to_cancel(&q->delay_timer) &&

			    ktime_to_ns(ktime_sub(

					hrtimer_get_expires(&q->delay_timer),