forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
8ff499e43c
commit
a2cb6a4dd4
|
@ -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));
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user