Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2cb6a4d authored by David S. Miller's avatar David S. Miller
Browse files

pkt_sched: Fix bogon in tasklet_hrtimer changes. 



Reported by Stephen Rothwell, luckily it's harmless:

net/sched/sch_api.c: In function 'qdisc_watchdog':
net/sched/sch_api.c:460: warning: initialization from incompatible pointer type
net/sched/sch_cbq.c: In function 'cbq_undelay':
net/sched/sch_cbq.c:595: warning: initialization from incompatible pointer type

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ff499e4

net/sched/sch_api.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ EXPORT_SYMBOL(qdisc_warn_nonwc); 
static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer)

{

	struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog,

						 timer);

						 timer.timer);



	wd->qdisc->flags &= ~TCQ_F_THROTTLED;

	__netif_schedule(qdisc_root(wd->qdisc));

net/sched/sch_cbq.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static psched_tdiff_t cbq_undelay_prio(struct cbq_sched_data *q, int prio, 
static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)

{

	struct cbq_sched_data *q = container_of(timer, struct cbq_sched_data,

						delay_timer);

						delay_timer.timer);

	struct Qdisc *sch = q->watchdog.qdisc;

	psched_time_t now;

	psched_tdiff_t delay = 0;