diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-26 09:37:54 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-26 09:37:54 +0200 |
| commit | 9e6d9c5e5889ce8fde5afc5066c5825a3d52114d (patch) | |
| tree | 5f145236afb7d7cb65efd7ed267ef131e7a05bda /net | |
| parent | 89236ce246166dc6fceef1164bd19cfc13b477a0 (diff) | |
| parent | 0a47df7bd2e94290b19870cd71909d3f24a9e959 (diff) | |
| download | lwn-9e6d9c5e5889ce8fde5afc5066c5825a3d52114d.tar.gz lwn-9e6d9c5e5889ce8fde5afc5066c5825a3d52114d.zip | |
Merge branch 'rt/atomic-locks' into rt/base
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_api.c | 2 | ||||
| -rw-r--r-- | net/sched/sch_cbq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index e1c2bf7e9ba4..92e6f3a52c13 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -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)); diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 81652d6ccd36..149b0405c5ec 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -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; |