]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
pkt_sched: Fix bogon in tasklet_hrtimer changes.
authorDavid S. Miller <davem@davemloft.net>
Tue, 25 Aug 2009 02:37:05 +0000 (19:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Aug 2009 02:37:05 +0000 (19:37 -0700)
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>
net/sched/sch_api.c
net/sched/sch_cbq.c

index e1c2bf7e9ba44ea70399d719a89b183141f66915..92e6f3a52c13560a1dc1a4a2f8483158c5296ea1 100644 (file)
@@ -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));
index 81652d6ccd36aa5038a92f14106a65ff65e1a27e..149b0405c5ec167c3d349f16567ef4b15c65ec01 100644 (file)
@@ -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;