Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a2cb6a4dd470d7a64255a10b843b0d188416b78f

Authored by David S. Miller
1 parent 8ff499e43c

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: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -458,7 +458,7 @@
458 458 static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer)
459 459 {
460 460 struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog,
461   - timer);
  461 + timer.timer);
462 462  
463 463 wd->qdisc->flags &= ~TCQ_F_THROTTLED;
464 464 __netif_schedule(qdisc_root(wd->qdisc));
... ... @@ -593,7 +593,7 @@
593 593 static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)
594 594 {
595 595 struct cbq_sched_data *q = container_of(timer, struct cbq_sched_data,
596   - delay_timer);
  596 + delay_timer.timer);
597 597 struct Qdisc *sch = q->watchdog.qdisc;
598 598 psched_time_t now;
599 599 psched_tdiff_t delay = 0;